From 9c5686be2028757b699632d5a01e8a69cb4a7856 Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Mon, 30 Jun 2025 19:16:31 +0100 Subject: [PATCH 1/6] Make auto-update run as the app Signed-off-by: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> --- .github/workflows/pr-auto-update.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-auto-update.yml b/.github/workflows/pr-auto-update.yml index 93b6e65b..56a44ae0 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -10,9 +10,15 @@ jobs: pull-requests: write contents: write steps: + - uses: actions/create-github-app-token@v2 + id: app-token + with: + app-id: 1363586 + private-key: ${{ secrets.PR_AUTO_UPDATE_PRIVATE_KEY }} + - uses: CSSUoB/pr-auto-updater@v2.1.2 env: - GITHUB_TOKEN: '${{ secrets.PR_AUTO_UPDATE_TOKEN }}' + GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }} PR_FILTER: 'labelled' PR_LABELS: 'sync' MERGE_CONFLICT_ACTION: 'label' From dda45a7c19573dd74836b45c9fcb2ac7dc77e6de Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Mon, 30 Jun 2025 20:17:50 +0100 Subject: [PATCH 2/6] Update pr-auto-update.yml Signed-off-by: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> --- .github/workflows/pr-auto-update.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-auto-update.yml b/.github/workflows/pr-auto-update.yml index 56a44ae0..017f7036 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -10,8 +10,9 @@ jobs: pull-requests: write contents: write steps: - - uses: actions/create-github-app-token@v2 - id: app-token + - name: Generate Access Token + uses: actions/create-github-app-token@v2 + id: generate-token with: app-id: 1363586 private-key: ${{ secrets.PR_AUTO_UPDATE_PRIVATE_KEY }} From ac4d1c3b1034937c1068947c01bf8142c173c624 Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Mon, 30 Jun 2025 20:28:47 +0100 Subject: [PATCH 3/6] test client secret Signed-off-by: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> --- .github/workflows/pr-auto-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-auto-update.yml b/.github/workflows/pr-auto-update.yml index 017f7036..71e17703 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -15,7 +15,7 @@ jobs: id: generate-token with: app-id: 1363586 - private-key: ${{ secrets.PR_AUTO_UPDATE_PRIVATE_KEY }} + private-key: ${{ secrets.PR_AUTO_UPDATE_CLIENT_SECRET }} - uses: CSSUoB/pr-auto-updater@v2.1.2 env: From 69be01cc74a2be32f46944b6b2a70d0188dc3fa9 Mon Sep 17 00:00:00 2001 From: MattyTheHacker <18513864+MattyTheHacker@users.noreply.github.com> Date: Mon, 30 Jun 2025 20:30:00 +0100 Subject: [PATCH 4/6] Revert "test client secret" This reverts commit ac4d1c3b1034937c1068947c01bf8142c173c624. --- .github/workflows/pr-auto-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-auto-update.yml b/.github/workflows/pr-auto-update.yml index 71e17703..017f7036 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -15,7 +15,7 @@ jobs: id: generate-token with: app-id: 1363586 - private-key: ${{ secrets.PR_AUTO_UPDATE_CLIENT_SECRET }} + private-key: ${{ secrets.PR_AUTO_UPDATE_PRIVATE_KEY }} - uses: CSSUoB/pr-auto-updater@v2.1.2 env: From a6c4d1221360bb6fa42cd9e98b42036490b58cea Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Mon, 30 Jun 2025 20:40:25 +0100 Subject: [PATCH 5/6] Update pr-auto-update.yml Signed-off-by: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> --- .github/workflows/pr-auto-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-auto-update.yml b/.github/workflows/pr-auto-update.yml index 017f7036..dddf6bbf 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -14,7 +14,7 @@ jobs: uses: actions/create-github-app-token@v2 id: generate-token with: - app-id: 1363586 + app-id: ${{ secrets.PR_AUTO_UPDATE_CLIENT_ID }} private-key: ${{ secrets.PR_AUTO_UPDATE_PRIVATE_KEY }} - uses: CSSUoB/pr-auto-updater@v2.1.2 From 22254eff2136475bd4c16c34947212cde582e4f0 Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Mon, 30 Jun 2025 20:59:46 +0100 Subject: [PATCH 6/6] Update pr-auto-update.yml Signed-off-by: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> --- .github/workflows/pr-auto-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-auto-update.yml b/.github/workflows/pr-auto-update.yml index dddf6bbf..b6aea318 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -14,7 +14,7 @@ jobs: uses: actions/create-github-app-token@v2 id: generate-token with: - app-id: ${{ secrets.PR_AUTO_UPDATE_CLIENT_ID }} + app-id: ${{ vars.PR_AUTO_UPDATE_CLIENT_ID }} private-key: ${{ secrets.PR_AUTO_UPDATE_PRIVATE_KEY }} - uses: CSSUoB/pr-auto-updater@v2.1.2