From 46c98e6d5d588cb4565a7da44a42e9d658b6314b Mon Sep 17 00:00:00 2001 From: Ivor Thibodo Date: Wed, 8 Jul 2026 09:47:36 -0500 Subject: [PATCH 1/2] ci(auto-merge): run on shipping bot --- .github/workflows/auto-merge.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml index 12706e1..920608c 100644 --- a/.github/workflows/auto-merge.yaml +++ b/.github/workflows/auto-merge.yaml @@ -8,7 +8,8 @@ jobs: runs-on: ubuntu-slim if: > github.event.pull_request.user.login == 'dependabot[bot]' || - github.event.pull_request.user.login == 'articulate-automation[bot]' + github.event.pull_request.user.login == 'articulate-automation[bot]' || + github.event.pull_request.user.login == 'articulate-shipping[bot]' steps: - name: Approve PR env: From 9b0b8ba98332e950f485a3d85eebf4ff838a1121 Mon Sep 17 00:00:00 2001 From: Ivor Thibodo Date: Wed, 8 Jul 2026 09:50:22 -0500 Subject: [PATCH 2/2] ci: use client-id instead of app-id for github app tokens --- .github/workflows/release.yaml | 2 +- .github/workflows/update-awscli.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ce149ad..aabb3fc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -12,7 +12,7 @@ jobs: - uses: actions/create-github-app-token@v3 id: token with: - app-id: ${{ secrets.GH_APP_ID }} + client-id: ${{ secrets.GH_CLIENT_ID }} private-key: ${{ secrets.GH_PRIVATE_KEY }} - uses: googleapis/release-please-action@v5 id: release diff --git a/.github/workflows/update-awscli.yaml b/.github/workflows/update-awscli.yaml index b517c5e..580ec23 100644 --- a/.github/workflows/update-awscli.yaml +++ b/.github/workflows/update-awscli.yaml @@ -46,7 +46,7 @@ jobs: uses: actions/create-github-app-token@v3 id: token with: - app-id: ${{ secrets.GH_APP_ID }} + client-id: ${{ secrets.GH_CLIENT_ID }} private-key: ${{ secrets.GH_PRIVATE_KEY }} - if: steps.update.outputs.changed == 'true' uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8