Merge branch 'dev' into fix/disabled-life-flask-and-pconc

Author: Peechey

.busted

@@ -1,6 +1,6 @@
 return {
     _all = {
-        coverage = true,
+        coverage = false,
         verbose = true,
     },
     default = {

.github/ISSUE_TEMPLATE/accuracy_bug_report.yaml

@@ -1,6 +1,6 @@
 name: Accuracy bug report
 description: Create a bug report to help us fix incorrect wording in Path of Building for PoE1.
-labels: ["bug:accuracy"]
+labels: ["bug: accuracy"]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/behaviour_bug_report.yaml

@@ -1,6 +1,6 @@
 name: Behaviour bug report
 description: Create a bug report to help us fix incorrect behaviour or logic in Path of Building for PoE1.
-labels: ["bug:behaviour"]
+labels: ["bug: behaviour"]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/calculation_bug_report.yaml

@@ -1,6 +1,6 @@
 name: Calculation bug report
 description: Create a bug report to help us fix incorrect calculations in Path of Building for PoE1.
-labels: ["bug:calculation"]
+labels: ["bug: calculation"]
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/workflows/backport.yml

@@ -1,22 +1,55 @@
 name: Port changes to PoB2
+run-name: "Port PR #${{ github.event.pull_request.number || inputs.pr_number }} - ${{ github.event.pull_request.title || 'Manual dispatch' }}"
 
 on:
-    pull_request_target:
-        types: [closed]
-
-env:
-    LABEL_STRING: ${{ join(github.event.pull_request.labels.*.name, ',') }}
+  pull_request_target:
+    types: [closed]
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: PoB1 PR number to port
+        required: true
+        type: number
 
 jobs:
-    backport:
-        if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'pob2')
-        runs-on: ubuntu-latest
-        steps:
-            - name: Notify PathOfBuilding repo
-              uses: peter-evans/repository-dispatch@v3
-              with:
-                token: ${{ secrets.WIRES77_PAT }}
-                repository: ${{ github.repository_owner }}/PathOfBuilding-PoE2
-                event-type: port-changes
-                client-payload: '{"patch_url": "${{ github.event.pull_request.patch_url }}", "msg": "Apply changes from ${{ github.event.pull_request.html_url }}", "id": ${{ github.event.pull_request.number }}, "title": "${{ github.event.pull_request.title }}", "labels": "${{ env.LABEL_STRING }}", "name": "${{ github.event.pull_request.user.name }}", "user": "${{ github.event.pull_request.user.login }}"}'
+  backport:
+    if: github.event_name == 'workflow_dispatch' || (github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'pob2'))
+    runs-on: ubuntu-latest
+    steps:
+      - name: Determine PR number
+        run: |
+          if [ "${{ github.event_name }}" = "pull_request_target" ]; then
+            echo "PR_NUMBER=${{ github.event.pull_request.number }}" >> "$GITHUB_ENV"
+          else
+            echo "PR_NUMBER=${{ github.event.inputs.pr_number }}" >> "$GITHUB_ENV"
+          fi
+
+      - name: Fetch PR details
+        id: payload
+        uses: actions/github-script@v7
+        with:
+          result-encoding: string
+          script: |
+            const pr = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: process.env.PR_NUMBER
+            });
+            const labels = pr.data.labels.map(l => l.name).join(',');
+            return JSON.stringify({
+              patch_url: pr.data.patch_url,
+              msg: `Apply changes from ${pr.data.html_url}`,
+              id: pr.data.number,
+              title: pr.data.title,
+              labels,
+              name: pr.data.user.name || pr.data.user.login,
+              user: pr.data.user.login,
+            });
 
+      - name: Notify PathOfBuilding-PoE2 repo
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.WIRES77_PAT }}
+          repository: ${{ github.repository_owner }}/PathOfBuilding-PoE2
+          event-type: port-changes
+          client-payload: ${{ steps.payload.outputs.result }}

.github/workflows/backport_receive.yml

@@ -1,5 +1,5 @@
 name: Update code with code from PoB2
-run-name: ${{ github.event.client_payload.title }}
+run-name: "PR #${{ github.event.client_payload.id }} - ${{ github.event.client_payload.title }}"
 
 on:
     repository_dispatch:
@@ -15,17 +15,22 @@ jobs:
               with:
                 ref: 'dev'
             - name: Apply patch
-              continue-on-error: true
               run: |
-                curl -L ${{ github.event.client_payload.patch_url }} | patch -p1 --merge --verbose -f -l --no-backup-if-mismatch
+                # Download patch first to avoid broken pipes if apply exits early
+                PATCH_FILE=$(mktemp)
+                curl -L ${{ github.event.client_payload.patch_url }} -o "$PATCH_FILE"
+                if ! git apply -v --3way --ignore-whitespace --index "$PATCH_FILE"; then
+                  echo "3-way apply failed, retrying with --reject"
+                  git apply -v --reject --ignore-whitespace --index "$PATCH_FILE" || true
+                fi
             - name: Create Pull Request
               uses: peter-evans/create-pull-request@v5
               with:
                 title: "[pob2-port] ${{ github.event.client_payload.title }}"
                 branch: pob2-pr-${{ github.event.client_payload.id }}
                 body: |
                   ${{ github.event.client_payload.msg }}
-                committer: ${{ github.event.client_payload.name || github.event.client_payload.user }} <${{ github.event.client_payload.user }}@users.noreply.github.com>
                 author: ${{ github.event.client_payload.name || github.event.client_payload.user }} <${{ github.event.client_payload.user }}@users.noreply.github.com>
+                committer: ${{ 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 }}
+                labels: ${{ github.event.client_payload.labels }}

.github/workflows/test.yml

@@ -14,9 +14,6 @@ jobs:
         uses: actions/checkout@v4
       - name: Run tests
         run: busted --lua=luajit
-      - name: Report coverage
-        continue-on-error: true # May fail on server errors (of coveralls.io)
-        run: cd src; luacov-coveralls --repo-token=${{ secrets.github_token }} -e TestData -e Data -e runtime
   check_modcache:
     runs-on: ubuntu-latest
     container: ghcr.io/pathofbuildingcommunity/pathofbuilding-tests:latest