From c8e8324540479e0aa68e059a4afbd985e0a67f30 Mon Sep 17 00:00:00 2001 From: Jonas Ha Date: Sat, 10 Jan 2026 19:27:33 -0500 Subject: [PATCH 1/3] feat(workflows): enhance dependabot auto-merge process - Add step to approve Dependabot PRs automatically before merge. - Change merge strategy from squash to merge for Dependabot PRs. --- .github/workflows/dependabot-auto-merge.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 93375ca8..85998ac0 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -15,9 +15,16 @@ jobs: uses: dependabot/fetch-metadata@v2 with: github-token: "${{ secrets.GITHUB_TOKEN }}" + + - name: Approve PR + run: gh pr review --approve "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GH_TOKEN: ${{secrets.GITHUB_TOKEN}} + - name: Enable auto-merge for Dependabot PRs if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' - run: gh pr merge --auto --squash "$PR_URL" + run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} - GH_TOKEN: ${{secrets.GITHUB_TOKEN}} + GH_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file From d702e127dd6c5358fe7ed103a111a67e8521e315 Mon Sep 17 00:00:00 2001 From: Jonas Ha Date: Sat, 10 Jan 2026 19:32:18 -0500 Subject: [PATCH 2/3] fix(workflows): adjust Dependabot PR auto-merge strategy - Change merge strategy from `merge` to `squash` for Dependabot PRs to ensure cleaner commit history. --- .github/workflows/dependabot-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 85998ac0..d72f9584 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -24,7 +24,7 @@ jobs: - name: Enable auto-merge for Dependabot PRs if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor' - run: gh pr merge --auto --merge "$PR_URL" + run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GH_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file From acbee97654f5d6a33511c44cd9b8b90fb71452dc Mon Sep 17 00:00:00 2001 From: Jonas Ha Date: Sat, 10 Jan 2026 19:36:14 -0500 Subject: [PATCH 3/3] feat(workflows): add auto-approval for changelog PRs - Implement step to automatically approve changelog pull requests. - Ensure consistency with existing auto-merge process. --- .github/workflows/update-changelog.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/update-changelog.yaml b/.github/workflows/update-changelog.yaml index e5a58cba..4b9045ce 100644 --- a/.github/workflows/update-changelog.yaml +++ b/.github/workflows/update-changelog.yaml @@ -49,6 +49,13 @@ jobs: labels: "automated,changelog,chore" delete-branch: true + - name: Approve PR + if: steps.cpr.outputs.pull-request-number + run: gh pr review --approve "$PR_URL" + env: + PR_URL: ${{ steps.cpr.outputs.pull-request-url }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Enable Auto-merge if: steps.cpr.outputs.pull-request-number run: gh pr merge --auto --squash "$PR_URL"