From ae5047c49991aa07028ae693672d1a0517abdff5 Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Mon, 26 May 2025 12:32:28 +0000 Subject: [PATCH 01/12] Add automatic pr updating workflow --- .github/workflows/pr-auto-update.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/pr-auto-update.yml diff --git a/.github/workflows/pr-auto-update.yml b/.github/workflows/pr-auto-update.yml new file mode 100644 index 00000000..61d05bf9 --- /dev/null +++ b/.github/workflows/pr-auto-update.yml @@ -0,0 +1,14 @@ +name: pr-auto-update +on: + push: {} + +jobs: + pr-auto-update: + name: Automatic PR Updater + runs-on: ubuntu-latest + steps: + - uses: CSSUoB/pr-auto-updater@v2.0.0 + env: + GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + PR_FILTER: 'labelled' + PR_LABELS: 'sync' From 21d3072cad1376f1678d0141acd8af806ea6e7f5 Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Mon, 26 May 2025 13:44:09 +0100 Subject: [PATCH 02/12] 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 61d05bf9..fac11e85 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -7,7 +7,7 @@ jobs: name: Automatic PR Updater runs-on: ubuntu-latest steps: - - uses: CSSUoB/pr-auto-updater@v2.0.0 + - uses: CSSUoB/pr-auto-updater@v2 env: GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' PR_FILTER: 'labelled' From 047fe0a6eb594b78f1b4541d4eea48e6e5a21dec Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Mon, 26 May 2025 13:57:39 +0100 Subject: [PATCH 03/12] 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 fac11e85..61d05bf9 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -7,7 +7,7 @@ jobs: name: Automatic PR Updater runs-on: ubuntu-latest steps: - - uses: CSSUoB/pr-auto-updater@v2 + - uses: CSSUoB/pr-auto-updater@v2.0.0 env: GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' PR_FILTER: 'labelled' From 9b5f839d99ad1161653762e5aa8fff89f058282c Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Mon, 26 May 2025 19:13:13 +0100 Subject: [PATCH 04/12] Fix permissions Signed-off-by: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> --- .github/workflows/pr-auto-update.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pr-auto-update.yml b/.github/workflows/pr-auto-update.yml index 61d05bf9..8e0e6276 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -6,6 +6,9 @@ jobs: pr-auto-update: name: Automatic PR Updater runs-on: ubuntu-latest + permissions: + pull-requests: write + contents: write steps: - uses: CSSUoB/pr-auto-updater@v2.0.0 env: From c3cecaf16976a12b817b8e5fb9aa8a837da04441 Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Wed, 4 Jun 2025 10:22:22 +0100 Subject: [PATCH 05/12] Update pr-auto-update.yml Signed-off-by: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> --- .github/workflows/pr-auto-update.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-auto-update.yml b/.github/workflows/pr-auto-update.yml index 8e0e6276..c8b405ba 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -10,8 +10,8 @@ jobs: pull-requests: write contents: write steps: - - uses: CSSUoB/pr-auto-updater@v2.0.0 + - uses: CSSUoB/pr-auto-updater@v2.1.2 env: - GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + GITHUB_TOKEN: '${{ secrets.pr-auto-updater }}' PR_FILTER: 'labelled' PR_LABELS: 'sync' From c4f1e5bee4d2863c44934bf94b0eeecd4b12615c Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Wed, 4 Jun 2025 10:24:01 +0100 Subject: [PATCH 06/12] 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 c8b405ba..5887f427 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -12,6 +12,6 @@ jobs: steps: - uses: CSSUoB/pr-auto-updater@v2.1.2 env: - GITHUB_TOKEN: '${{ secrets.pr-auto-updater }}' + GITHUB_TOKEN: '${{ secrets.PR_UPDATE_TOKEN }}' PR_FILTER: 'labelled' PR_LABELS: 'sync' From fbeca4fd81eb689f5ece2a5728d4dc12e6333238 Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Wed, 4 Jun 2025 10:24:59 +0100 Subject: [PATCH 07/12] Add conflict labelling Signed-off-by: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> --- .github/workflows/pr-auto-update.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr-auto-update.yml b/.github/workflows/pr-auto-update.yml index 5887f427..860bb6f1 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -15,3 +15,5 @@ jobs: GITHUB_TOKEN: '${{ secrets.PR_UPDATE_TOKEN }}' PR_FILTER: 'labelled' PR_LABELS: 'sync' + MERGE_CONFLICT_ACTION: 'label' + MERGE_CONFLICT_LABEL: 'conflict' From 9e3ec3787a5b4aa13950fee18a6db35f830dc769 Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Wed, 4 Jun 2025 10:45:39 +0100 Subject: [PATCH 08/12] 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 860bb6f1..93b6e65b 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: CSSUoB/pr-auto-updater@v2.1.2 env: - GITHUB_TOKEN: '${{ secrets.PR_UPDATE_TOKEN }}' + GITHUB_TOKEN: '${{ secrets.PR_AUTO_UPDATE_TOKEN }}' PR_FILTER: 'labelled' PR_LABELS: 'sync' MERGE_CONFLICT_ACTION: 'label' From f5465b48418be79c55c549678268ed2e9360b808 Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Wed, 4 Jun 2025 10:46:59 +0100 Subject: [PATCH 09/12] 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 93b6e65b..860bb6f1 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: CSSUoB/pr-auto-updater@v2.1.2 env: - GITHUB_TOKEN: '${{ secrets.PR_AUTO_UPDATE_TOKEN }}' + GITHUB_TOKEN: '${{ secrets.PR_UPDATE_TOKEN }}' PR_FILTER: 'labelled' PR_LABELS: 'sync' MERGE_CONFLICT_ACTION: 'label' From c1696500754204d65d3c3b1b664d23f41171d088 Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Wed, 4 Jun 2025 10:53:29 +0100 Subject: [PATCH 10/12] 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 860bb6f1..93b6e65b 100644 --- a/.github/workflows/pr-auto-update.yml +++ b/.github/workflows/pr-auto-update.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: CSSUoB/pr-auto-updater@v2.1.2 env: - GITHUB_TOKEN: '${{ secrets.PR_UPDATE_TOKEN }}' + GITHUB_TOKEN: '${{ secrets.PR_AUTO_UPDATE_TOKEN }}' PR_FILTER: 'labelled' PR_LABELS: 'sync' MERGE_CONFLICT_ACTION: 'label' From e77f124e22795d4f8267b583a4274482debb8cf7 Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Wed, 4 Jun 2025 10:55:04 +0100 Subject: [PATCH 11/12] Create test_file.md Signed-off-by: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> --- test_file.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 test_file.md diff --git a/test_file.md b/test_file.md new file mode 100644 index 00000000..e0239ab2 --- /dev/null +++ b/test_file.md @@ -0,0 +1,3 @@ +# Test File + +hey look a new file! From dc8c25d9543c25d86ba9d580c685e0761d9e1e1f Mon Sep 17 00:00:00 2001 From: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> Date: Wed, 4 Jun 2025 10:59:02 +0100 Subject: [PATCH 12/12] Delete test_file.md Signed-off-by: Matty Widdop <18513864+MattyTheHacker@users.noreply.github.com> --- test_file.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 test_file.md diff --git a/test_file.md b/test_file.md deleted file mode 100644 index e0239ab2..00000000 --- a/test_file.md +++ /dev/null @@ -1,3 +0,0 @@ -# Test File - -hey look a new file!