From af558167f32d239b2bf9971e6c5120831c1d38c4 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Thu, 12 Feb 2026 04:00:22 -0500 Subject: [PATCH 1/2] Develop (#83) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ptr727 <2061579+ptr727@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/merge-bot-pull-request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-bot-pull-request.yml b/.github/workflows/merge-bot-pull-request.yml index 615ed52..e62689d 100644 --- a/.github/workflows/merge-bot-pull-request.yml +++ b/.github/workflows/merge-bot-pull-request.yml @@ -27,7 +27,7 @@ jobs: - name: Merge pull request step if: steps.metadata.outputs.update-type != 'version-update:semver-major' - 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}} @@ -43,7 +43,7 @@ jobs: steps: - name: Merge pull request step - 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}} From c10de14e2d1ca5e927350815ea945bf828e58b6e Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Thu, 12 Feb 2026 11:10:00 +0200 Subject: [PATCH 2/2] Enable signing of commits in codegen pull request workflow --- .github/workflows/run-codegen-pull-request-task.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-codegen-pull-request-task.yml b/.github/workflows/run-codegen-pull-request-task.yml index 08efd05..cc68985 100644 --- a/.github/workflows/run-codegen-pull-request-task.yml +++ b/.github/workflows/run-codegen-pull-request-task.yml @@ -40,3 +40,4 @@ jobs: body: 'This PR updates the codegen files.' commit-message: 'Update codegen files' delete-branch: true + sign-commits: true