From 7f2a9e07de7a654b08064e868203673c0af38511 Mon Sep 17 00:00:00 2001 From: Ray Orsini Date: Sat, 16 May 2026 14:45:56 -0400 Subject: [PATCH 1/3] feat(868jnb87e): add auto-merge caller workflow Companion to https://app.clickup.com/t/868jnb87e Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/auto-merge.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/auto-merge.yml diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml new file mode 100644 index 0000000..fba68d5 --- /dev/null +++ b/.github/workflows/auto-merge.yml @@ -0,0 +1,11 @@ +name: Auto-Merge + +on: + pull_request: + types: [opened, synchronize, reopened, ready_for_review] + +jobs: + auto-merge: + uses: OITApps/.github/.github/workflows/auto-merge.yml@main + secrets: + merge_token: ${{ secrets.PROJECT_TOKEN }} From 1bd4ff5b80ad0ae28467c600eb636b4b70f21a36 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 16 May 2026 14:55:06 -0400 Subject: [PATCH 2/3] chore: retrigger workflow after PROJECT_TOKEN fix From cf770b7ba40e8917a677a1c4796a01f929370f79 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 16 May 2026 15:00:10 -0400 Subject: [PATCH 3/3] fix: inline auto-merge workflow (public repo can't use private reusable) --- .github/workflows/auto-merge.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index fba68d5..0460403 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -4,8 +4,16 @@ on: pull_request: types: [opened, synchronize, reopened, ready_for_review] +permissions: + contents: write + pull-requests: write + jobs: - auto-merge: - uses: OITApps/.github/.github/workflows/auto-merge.yml@main - secrets: - merge_token: ${{ secrets.PROJECT_TOKEN }} + enable-auto-merge: + runs-on: ubuntu-latest + if: github.event.pull_request.draft == false + steps: + - env: + GH_TOKEN: ${{ secrets.PROJECT_TOKEN }} + PR_URL: ${{ github.event.pull_request.html_url }} + run: gh pr merge "$PR_URL" --auto --squash