From e83f0f0f7a8c9cf32bbe9ecb488ea4a96c9757a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20BREVET?= Date: Wed, 17 Jun 2026 15:29:20 +0200 Subject: [PATCH] build: auto merge PRs from scala steward Motivation: If the build pass, there is no other human verification before merging dependency PR. Modifications: * Add auto-merge worfklow Result: PRs from scala steward will be automatically merged into the codebase if the build is successful --- .github/workflows/auto-merge.yml | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/auto-merge.yml diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml new file mode 100644 index 0000000..e0b572d --- /dev/null +++ b/.github/workflows/auto-merge.yml @@ -0,0 +1,35 @@ +name: Auto Merge + +on: + workflow_run: + workflows: + - Build + types: + - completed + +jobs: + auto-merge: + if: > + github.event.workflow_run.conclusion == 'success' && + github.event.workflow_run.event == 'pull_request' && + github.event.workflow_run.actor.login == 'scala-steward-gatling[bot]' + runs-on: ubuntu-latest + steps: + - name: Merge pull request + env: + GH_TOKEN: ${{ secrets.GATLING_CI_TOKEN }} + run: | + PR_NUMBER=$(gh api \ + "repos/${{ github.repository }}/pulls" \ + --jq "[.[] | select(.head.sha == \"${{ github.event.workflow_run.head_sha }}\") | .number] | first") + + if [ -z "$PR_NUMBER" ] || [ "$PR_NUMBER" = "null" ]; then + echo "No open PR found for commit ${{ github.event.workflow_run.head_sha }}" + exit 0 + fi + + echo "Auto-merging PR #$PR_NUMBER" + gh pr merge "$PR_NUMBER" \ + --repo "${{ github.repository }}" \ + --rebase \ + --delete-branch