From 1df222373fd2430a96f572214a423f2eed75f766 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Sun, 5 Apr 2026 15:33:37 -0700 Subject: [PATCH 1/3] Refactor merge-codegen job conditions and update run-codegen workflow for consistency --- .github/workflows/merge-bot-pull-request.yml | 2 +- .github/workflows/run-codegen-pull-request-task.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-bot-pull-request.yml b/.github/workflows/merge-bot-pull-request.yml index 8ce8d48..d0221f9 100644 --- a/.github/workflows/merge-bot-pull-request.yml +++ b/.github/workflows/merge-bot-pull-request.yml @@ -35,7 +35,7 @@ jobs: merge-codegen: name: Merge codegen pull request job runs-on: ubuntu-latest - if: github.event.pull_request.head.ref == 'codegen' && github.event.pull_request.head.repo.full_name == github.repository && contains(github.event.pull_request.labels.*.name, 'automated-codegen') + if: github.event.pull_request.user.login == 'ptr727' && github.event.pull_request.head.ref == 'codegen' && github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.repo.full_name == github.repository permissions: contents: write pull-requests: write diff --git a/.github/workflows/run-codegen-pull-request-task.yml b/.github/workflows/run-codegen-pull-request-task.yml index 65a27d6..2c371fd 100644 --- a/.github/workflows/run-codegen-pull-request-task.yml +++ b/.github/workflows/run-codegen-pull-request-task.yml @@ -21,6 +21,8 @@ jobs: - name: Checkout code step uses: actions/checkout@v6 + with: + ref: main - name: Run codegen step run: | @@ -38,10 +40,10 @@ jobs: uses: peter-evans/create-pull-request@v8 with: token: ${{ secrets.WORKFLOW_PAT }} + base: main branch: codegen title: 'Update codegen files' body: 'This PR updates the codegen files.' commit-message: 'Update codegen files' delete-branch: true sign-commits: true - labels: automated-codegen From 758c9f3a34431494abe6cb3f0e04a5a9aedd055e Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Sun, 5 Apr 2026 15:42:58 -0700 Subject: [PATCH 2/3] Fix condition for merging codegen pull requests to include github.actor check --- .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 d0221f9..c355c39 100644 --- a/.github/workflows/merge-bot-pull-request.yml +++ b/.github/workflows/merge-bot-pull-request.yml @@ -35,7 +35,7 @@ jobs: merge-codegen: name: Merge codegen pull request job runs-on: ubuntu-latest - if: github.event.pull_request.user.login == 'ptr727' && github.event.pull_request.head.ref == 'codegen' && github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.repo.full_name == github.repository + if: github.actor == 'ptr727' && github.event.pull_request.user.login == 'ptr727' && github.event.pull_request.head.ref == 'codegen' && github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.repo.full_name == github.repository permissions: contents: write pull-requests: write From 0758b99bf5bc2dc7f301c9e00dd49b246e09772f Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Sun, 5 Apr 2026 15:46:31 -0700 Subject: [PATCH 3/3] Add pull request types to trigger merge bot action --- .github/workflows/merge-bot-pull-request.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge-bot-pull-request.yml b/.github/workflows/merge-bot-pull-request.yml index c355c39..36b61cd 100644 --- a/.github/workflows/merge-bot-pull-request.yml +++ b/.github/workflows/merge-bot-pull-request.yml @@ -2,6 +2,7 @@ name: Merge bot pull request action on: pull_request: + types: [opened, reopened, synchronize] concurrency: group: ${{ github.workflow }}-${{ github.ref }}