From 65115a94e3ffa93e091fc3368ab06015b270fb14 Mon Sep 17 00:00:00 2001 From: Wires77 Date: Tue, 15 Apr 2025 23:38:49 -0500 Subject: [PATCH 1/8] Test receive hook --- .github/workflows/backport_receive.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/backport_receive.yml diff --git a/.github/workflows/backport_receive.yml b/.github/workflows/backport_receive.yml new file mode 100644 index 0000000000..0577eaf196 --- /dev/null +++ b/.github/workflows/backport_receive.yml @@ -0,0 +1,26 @@ +name: Update code with code from PoB2 + +on: + repository_dispatch: + types: + - port-changes + +jobs: + apply-patch: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + ref: 'dev' + - name: Apply patch + run: | + wget ${{ github.event.client_payload.patch_url }} | git apply -v --index + - name: Create Pull Request + uses: peter-evans/create-pull-request@v5 + with: + title: Port changes from PoB2 PR ${{ github.event.client_payload.id }} + branch: pob2-pr-${{ github.event.client_payload.id }} + body: | + ${{ github.event.client_payload.msg }} + commit-message: ${{ github.event.client_payload.msg }} \ No newline at end of file From 4369e57195dc76533ba1a4f0886b6278d0f616a5 Mon Sep 17 00:00:00 2001 From: Wires77 Date: Wed, 16 Apr 2025 00:05:08 -0500 Subject: [PATCH 2/8] Use curl --- .github/workflows/backport_receive.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport_receive.yml b/.github/workflows/backport_receive.yml index 0577eaf196..9dcac8d541 100644 --- a/.github/workflows/backport_receive.yml +++ b/.github/workflows/backport_receive.yml @@ -15,7 +15,7 @@ jobs: ref: 'dev' - name: Apply patch run: | - wget ${{ github.event.client_payload.patch_url }} | git apply -v --index + curl ${{ github.event.client_payload.patch_url }} | git apply -v --index - name: Create Pull Request uses: peter-evans/create-pull-request@v5 with: From 8a0b7312701d540f2ff3ffbb777985ed1db81d67 Mon Sep 17 00:00:00 2001 From: Wires77 Date: Wed, 16 Apr 2025 00:08:57 -0500 Subject: [PATCH 3/8] Follow redirect --- .github/workflows/backport_receive.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport_receive.yml b/.github/workflows/backport_receive.yml index 9dcac8d541..8c8d33c413 100644 --- a/.github/workflows/backport_receive.yml +++ b/.github/workflows/backport_receive.yml @@ -15,7 +15,7 @@ jobs: ref: 'dev' - name: Apply patch run: | - curl ${{ github.event.client_payload.patch_url }} | git apply -v --index + curl -L ${{ github.event.client_payload.patch_url }} | git apply -v --index - name: Create Pull Request uses: peter-evans/create-pull-request@v5 with: From 247398790578d62e7c9ff5ac7b0adbe557bf5eab Mon Sep 17 00:00:00 2001 From: Wires77 Date: Wed, 16 Apr 2025 05:18:03 +0000 Subject: [PATCH 4/8] Apply changes from https://github.com/Wires77/PathOfBuilding-PoE2/pull/5 --- help.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/help.txt b/help.txt index b728173120..76756d6554 100644 --- a/help.txt +++ b/help.txt @@ -11,7 +11,7 @@ While holding shift scroll bars in the help section and version history will jum General Shortcuts: -Ctrl + 1 Jump to tree tab +Ctrl + 1 Jump to trees tab Ctrl + 2 Jump to skills tab Ctrl + 3 Jump to items tab Ctrl + 4 Jump to calcs tab From a353b6721d635ba683c3da15025730e61c915a1a Mon Sep 17 00:00:00 2001 From: Wires77 Date: Wed, 16 Apr 2025 01:05:30 -0500 Subject: [PATCH 5/8] Add labels and better title --- .github/workflows/backport_receive.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backport_receive.yml b/.github/workflows/backport_receive.yml index 8c8d33c413..137903aa9f 100644 --- a/.github/workflows/backport_receive.yml +++ b/.github/workflows/backport_receive.yml @@ -19,8 +19,9 @@ jobs: - name: Create Pull Request uses: peter-evans/create-pull-request@v5 with: - title: Port changes from PoB2 PR ${{ github.event.client_payload.id }} + title: \[pob2-port\] ${{ github.event.client_payload.title }} branch: pob2-pr-${{ github.event.client_payload.id }} body: | ${{ github.event.client_payload.msg }} - commit-message: ${{ github.event.client_payload.msg }} \ No newline at end of file + commit-message: ${{ github.event.client_payload.msg }} + labels: ${{ github.event.client_payload.labels }} \ No newline at end of file From ebc78acadf303baff9ad482c19bac40b61f81ca5 Mon Sep 17 00:00:00 2001 From: Wires77 Date: Wed, 16 Apr 2025 01:31:41 -0500 Subject: [PATCH 6/8] Set author --- .github/workflows/backport_receive.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/backport_receive.yml b/.github/workflows/backport_receive.yml index 137903aa9f..0fa85ecf88 100644 --- a/.github/workflows/backport_receive.yml +++ b/.github/workflows/backport_receive.yml @@ -23,5 +23,6 @@ jobs: branch: pob2-pr-${{ github.event.client_payload.id }} body: | ${{ github.event.client_payload.msg }} + author: ${{ github.event.client_payload.name || github.event.client_payload.user }} <${{ github.event.client_payload.user }}@users.noreply.github.com> commit-message: ${{ github.event.client_payload.msg }} labels: ${{ github.event.client_payload.labels }} \ No newline at end of file From b275993e6e1bbfeb15a23c656d8f74588ed88d2a Mon Sep 17 00:00:00 2001 From: Wires77 Date: Wed, 16 Apr 2025 01:37:51 -0500 Subject: [PATCH 7/8] Update RELEASE.md --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 42f34b614e..edd7ff67c0 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,6 +1,6 @@ # How to release Path of Building Community -## Prerequisites +## Prerequisites123 ## Choosing a new version number From d99154cebb0967bb3c6fa24c735ef98aeb557ef1 Mon Sep 17 00:00:00 2001 From: Wires77 Date: Wed, 16 Apr 2025 06:38:23 +0000 Subject: [PATCH 8/8] Apply changes from https://github.com/Wires77/PathOfBuilding-PoE2/pull/11 --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index edd7ff67c0..da7df66643 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,6 +1,6 @@ # How to release Path of Building Community -## Prerequisites123 +## Prerequisites12 ## Choosing a new version number