From 1ae8eddc2df7a8193959bbccc4eda875b7237619 Mon Sep 17 00:00:00 2001 From: Daniel Badura Date: Wed, 1 Dec 2021 18:43:14 +0100 Subject: [PATCH 1/2] Add workflow file for automating the merges of PR opened by @dependabot. This also tries to NOT squash all CI files into one. --- .../workflows/merge-dependabot-upgrades.yml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/merge-dependabot-upgrades.yml diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml new file mode 100644 index 00000000..c4b50547 --- /dev/null +++ b/.github/workflows/merge-dependabot-upgrades.yml @@ -0,0 +1,27 @@ +# See https://github.com/ridedott/merge-me-action/ +# This workflow automates merges from patches sent by Dependabot, and +# only by dependabot, once the other CI workflows pass +name: Auto-merge Dependabot PRs + +on: + workflow_run: + types: + - completed + workflows: + - "Check Coding Standards" + - "Static Analysis by PHPStan" + - "Static Analysis by Psalm" + - "Static Analysis by Require-Checker" + - "PHPUnit tests" + +jobs: + merge-me: + name: Auto-merge Dependabot PRs + runs-on: ubuntu-latest + steps: + - name: Auto-Merge + if: ${{ github.event.workflow_run.conclusion == 'success' }} + uses: ridedott/merge-me-action@v2 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + MERGE_METHOD: MERGE \ No newline at end of file From 5fbbcef7a6591909b5d2ae15de11e94ece602c9b Mon Sep 17 00:00:00 2001 From: Daniel Badura Date: Wed, 1 Dec 2021 18:49:05 +0100 Subject: [PATCH 2/2] add missing newline at the end of the file --- .github/workflows/merge-dependabot-upgrades.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-dependabot-upgrades.yml b/.github/workflows/merge-dependabot-upgrades.yml index c4b50547..d6abf9c3 100644 --- a/.github/workflows/merge-dependabot-upgrades.yml +++ b/.github/workflows/merge-dependabot-upgrades.yml @@ -24,4 +24,4 @@ jobs: uses: ridedott/merge-me-action@v2 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MERGE_METHOD: MERGE \ No newline at end of file + MERGE_METHOD: MERGE