From 0e33c3e51d2d8186433b8012cbf2a7a6fe996359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Pallar=C3=A9s?= Date: Thu, 2 Apr 2026 09:55:31 +0200 Subject: [PATCH 1/2] chore(ci): fix automation --- .github/workflows/dependabot-auto-merge.yml | 10 +++++++--- .github/workflows/release-auto-merge.yml | 1 + .github/workflows/release.yml | 1 - 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 1d9e126..cb3dab2 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -13,10 +13,14 @@ jobs: name: Auto-merge runs-on: ubuntu-latest if: github.actor == 'dependabot[bot]' - steps: + - name: Approve + run: gh pr review "$PR_URL" --approve --comment --body "Auto-approve Dependabot pull requests" + env: + PR_URL: ${{ github.event.pull_request.html_url }} + GH_TOKEN: ${{ secrets.LOCALSTACK_BOT_TOKEN }} - name: Enable auto-merge - run: gh pr merge --auto --squash "$PR_URL" + run: gh pr merge "$PR_URL" --auto --squash env: PR_URL: ${{ github.event.pull_request.html_url }} - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.LOCALSTACK_BOT_TOKEN }} diff --git a/.github/workflows/release-auto-merge.yml b/.github/workflows/release-auto-merge.yml index 7edaa52..089369e 100644 --- a/.github/workflows/release-auto-merge.yml +++ b/.github/workflows/release-auto-merge.yml @@ -26,5 +26,6 @@ jobs: --jq '.[].number' | \ while read -r pr; do echo "Enabling auto-merge on PR #$pr" + gh pr review "$pr" --approve --comment --body "Auto-approve weekly releases" gh pr merge "$pr" --auto --squash done diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ddd8620..e62b09e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,6 @@ jobs: - uses: googleapis/release-please-action@v4 id: release with: - token: ${{ secrets.LOCALSTACK_BOT_TOKEN }} release-type: node build: From 103d93e182f6d1d4293773de88f4ee49ba2dec52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Pallar=C3=A9s?= Date: Thu, 2 Apr 2026 10:03:04 +0200 Subject: [PATCH 2/2] consistent naming --- .github/workflows/dependabot-auto-merge.yml | 2 +- .github/workflows/release-auto-merge.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index cb3dab2..7680b68 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -10,7 +10,7 @@ permissions: jobs: auto-merge: - name: Auto-merge + name: Auto-merge dependabot pull requests runs-on: ubuntu-latest if: github.actor == 'dependabot[bot]' steps: diff --git a/.github/workflows/release-auto-merge.yml b/.github/workflows/release-auto-merge.yml index 089369e..42c1c0c 100644 --- a/.github/workflows/release-auto-merge.yml +++ b/.github/workflows/release-auto-merge.yml @@ -11,10 +11,10 @@ permissions: jobs: auto-merge: - name: Enable auto-merge on release PRs + name: Auto-merge release pull requests runs-on: ubuntu-latest steps: - - name: Enable auto-merge on release PRs + - name: Find release pull request, approve and enable auto-merge env: GH_TOKEN: ${{ secrets.LOCALSTACK_BOT_TOKEN }} GH_REPO: ${{ github.repository }}