diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml new file mode 100644 index 0000000..66deb61 --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,17 @@ +name: automerge +on: + pull_request_target: + +jobs: + automerge: + name: Dependabot auto-merge + + runs-on: ubuntu-22.04 + + if: ${{ github.actor == 'dependabot[bot]' }} + + steps: + - uses: peter-evans/enable-pull-request-automerge@v2 + with: + pull-request-number: ${{ github.event.pull_request.number }} + merge-method: squash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5c9e7f..aea6c73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -251,19 +251,3 @@ jobs: - typo3-version: "^12.2" php-version: "8.1" composer-dependencies: highest - automerge: - name: Dependabot auto-merge - runs-on: ubuntu-22.04 - needs: [ php-lint, code-quality, code-quality-frontend, unit-tests, functional-tests ] - if: ${{ github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target' }} - steps: - - name: automerge - uses: pascalgn/automerge-action@v0.15.6 - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - MERGE_ERROR_FAIL: true - MERGE_LABELS: "dependencies,!blocked,!wip" - MERGE_METHOD: "rebase" - MERGE_READY_STATE: "clean,unstable" - MERGE_RETRIES: 0 -