From c0153eafe4c23f06c3706c8aebc6342b51a2d987 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Wed, 15 Apr 2026 09:24:13 -0700 Subject: [PATCH 1/4] Update merge bot workflow to include GitHub Actions updates in merge conditions --- .github/workflows/merge-bot-pull-request.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merge-bot-pull-request.yml b/.github/workflows/merge-bot-pull-request.yml index 39c1a65..5d2d0ff 100644 --- a/.github/workflows/merge-bot-pull-request.yml +++ b/.github/workflows/merge-bot-pull-request.yml @@ -26,8 +26,10 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" + # Merge all GitHub Actions updates (major versions are common e.g. v2->v3), + # but skip major version NuGet updates as they may contain breaking changes. - name: Merge pull request step - if: steps.metadata.outputs.update-type != 'version-update:semver-major' + if: steps.metadata.outputs.package-ecosystem == 'github_actions' || steps.metadata.outputs.update-type != 'version-update:semver-major' run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} From 50af7da89531d3eed252e7f35c5b9453f04a6ad8 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Wed, 15 Apr 2026 09:29:02 -0700 Subject: [PATCH 2/4] Update merge bot to allow major version updates for GitHub Actions while skipping major NuGet updates --- .github/workflows/merge-bot-pull-request.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge-bot-pull-request.yml b/.github/workflows/merge-bot-pull-request.yml index 5d2d0ff..1259afd 100644 --- a/.github/workflows/merge-bot-pull-request.yml +++ b/.github/workflows/merge-bot-pull-request.yml @@ -26,10 +26,10 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" - # Merge all GitHub Actions updates (major versions are common e.g. v2->v3), - # but skip major version NuGet updates as they may contain breaking changes. + # Skip major version NuGet updates as they may contain breaking changes. + # All other ecosystems (e.g. github-actions) allow major updates (e.g. v2->v3). - name: Merge pull request step - if: steps.metadata.outputs.package-ecosystem == 'github_actions' || steps.metadata.outputs.update-type != 'version-update:semver-major' + if: steps.metadata.outputs.package-ecosystem != 'nuget' || steps.metadata.outputs.update-type != 'version-update:semver-major' run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} From 46eaaebcba2d47347b44499c6281969c76bb4dd9 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Wed, 15 Apr 2026 09:35:26 -0700 Subject: [PATCH 3/4] Fix formatting of conditional statement in merge bot workflow --- .github/workflows/merge-bot-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-bot-pull-request.yml b/.github/workflows/merge-bot-pull-request.yml index 1259afd..b504ec6 100644 --- a/.github/workflows/merge-bot-pull-request.yml +++ b/.github/workflows/merge-bot-pull-request.yml @@ -29,7 +29,7 @@ jobs: # Skip major version NuGet updates as they may contain breaking changes. # All other ecosystems (e.g. github-actions) allow major updates (e.g. v2->v3). - name: Merge pull request step - if: steps.metadata.outputs.package-ecosystem != 'nuget' || steps.metadata.outputs.update-type != 'version-update:semver-major' + if: (steps.metadata.outputs.package-ecosystem != 'nuget') || (steps.metadata.outputs.update-type != 'version-update:semver-major') run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} From 5cae878ad9b29a1fce4b2cf4b94aca2b7137e065 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Wed, 15 Apr 2026 09:37:03 -0700 Subject: [PATCH 4/4] Refactor comments and formatting in merge bot workflow for clarity --- .github/workflows/merge-bot-pull-request.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge-bot-pull-request.yml b/.github/workflows/merge-bot-pull-request.yml index b504ec6..a24543a 100644 --- a/.github/workflows/merge-bot-pull-request.yml +++ b/.github/workflows/merge-bot-pull-request.yml @@ -26,10 +26,13 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" - # Skip major version NuGet updates as they may contain breaking changes. - # All other ecosystems (e.g. github-actions) allow major updates (e.g. v2->v3). + # Merge if either condition is true: + # Non-NuGet ecosystems (e.g. github-actions) allow all updates including major (e.g. v2->v3) + # NuGet allows only minor and patch updates, skipping major as they may contain breaking changes - name: Merge pull request step - if: (steps.metadata.outputs.package-ecosystem != 'nuget') || (steps.metadata.outputs.update-type != 'version-update:semver-major') + if: >- + (steps.metadata.outputs.package-ecosystem != 'nuget') || + (steps.metadata.outputs.update-type != 'version-update:semver-major') run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}}