diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d853f80..c425bb0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,3 +6,12 @@ updates: interval: weekly day: tuesday open-pull-requests-limit: 10 + target-branch: 'master' +- package-ecosystem: npm + directory: "/" + schedule: + interval: weekly + day: tuesday + open-pull-requests-limit: 10 + target-branch: 'v1-node16' + \ No newline at end of file diff --git a/.mergify.yml b/.mergify.yml index db3608c..da362f5 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,3 +1,4 @@ + queue_rules: - name: default conditions: @@ -7,7 +8,7 @@ queue_rules: pull_request_rules: - name: Automatically merge on CI success and review approval conditions: - - base~=master|integ-tests + - base~=master|v1-node16|integ-tests - "#approved-reviews-by>=1" - -approved-reviews-by~=author - status-success=Run Unit Tests @@ -23,7 +24,7 @@ pull_request_rules: - name: Automatically approve and merge Dependabot PRs conditions: - - base=master + - base~=master|v1-node16 - author=dependabot[bot] - status-success=Run Unit Tests - -title~=(WIP|wip) diff --git a/action.yml b/action.yml index 53337d3..e77b860 100644 --- a/action.yml +++ b/action.yml @@ -59,6 +59,6 @@ outputs: aws-account-id: description: 'The AWS account ID for the provided credentials' runs: - using: 'node12' + using: 'node16' main: 'dist/index.js' post: 'dist/cleanup/index.js'