From 6958eaa9b5da37d6208f40137b4447bffcc23135 Mon Sep 17 00:00:00 2001 From: Tom Jenkinson Date: Wed, 7 Oct 2020 18:48:42 +0100 Subject: [PATCH 1/3] auto merge dependadabot updates --- .github/workflows/automerge-dependencies.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/automerge-dependencies.yml diff --git a/.github/workflows/automerge-dependencies.yml b/.github/workflows/automerge-dependencies.yml new file mode 100644 index 000000000000..0f354613a4ac --- /dev/null +++ b/.github/workflows/automerge-dependencies.yml @@ -0,0 +1,14 @@ +name: Auto Merge Dependency Updates + +on: + - pull_request + - pull_request_review + +jobs: + run: + runs-on: ubuntu-latest + steps: + - uses: tjenkinson/gh-action-auto-merge-dependency-updates@0882a8e + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + allowed-actors: dependabot[bot] From 1f331dec08b01bfb5cc06156f6b7bfa118360ca7 Mon Sep 17 00:00:00 2001 From: Tom Jenkinson Date: Thu, 8 Oct 2020 20:41:10 +0100 Subject: [PATCH 2/3] add gh-action-auto-merge-dependency-updates to allowed actions --- .github/allowed-actions.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js index a58a6a578d28..c14d32b16330 100644 --- a/.github/allowed-actions.js +++ b/.github/allowed-actions.js @@ -31,5 +31,6 @@ module.exports = [ 'repo-sync/github-sync@v2', 'repo-sync/pull-request@v2', 'rtCamp/action-slack-notify@master', - 'rtCamp/action-slack-notify@v2.1.0' -] \ No newline at end of file + 'rtCamp/action-slack-notify@v2.1.0', + 'tjenkinson/gh-action-auto-merge-dependency-updates@0882a8e' +] From a224e291b5d9cde5108e82964f4dab99cec23e12 Mon Sep 17 00:00:00 2001 From: Tom Jenkinson Date: Thu, 8 Oct 2020 21:36:43 +0100 Subject: [PATCH 3/3] update dependency auto merge to version that will approve PR --- .github/allowed-actions.js | 2 +- .github/workflows/automerge-dependencies.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/allowed-actions.js b/.github/allowed-actions.js index c14d32b16330..efe48d0cf068 100644 --- a/.github/allowed-actions.js +++ b/.github/allowed-actions.js @@ -32,5 +32,5 @@ module.exports = [ 'repo-sync/pull-request@v2', 'rtCamp/action-slack-notify@master', 'rtCamp/action-slack-notify@v2.1.0', - 'tjenkinson/gh-action-auto-merge-dependency-updates@0882a8e' + 'tjenkinson/gh-action-auto-merge-dependency-updates@cee2ac0' ] diff --git a/.github/workflows/automerge-dependencies.yml b/.github/workflows/automerge-dependencies.yml index 0f354613a4ac..9650706fce12 100644 --- a/.github/workflows/automerge-dependencies.yml +++ b/.github/workflows/automerge-dependencies.yml @@ -8,7 +8,7 @@ jobs: run: runs-on: ubuntu-latest steps: - - uses: tjenkinson/gh-action-auto-merge-dependency-updates@0882a8e + - uses: tjenkinson/gh-action-auto-merge-dependency-updates@cee2ac0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} allowed-actors: dependabot[bot]