Merge branch 'dev' into autoAttributeRatio

Author: majochem

.github/tweak_changelogs.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+RELEASE_VERSION="$1"
+
+# Delete until and including the first line containing "<!-- Release notes generated"
+sed -i '1,/^<!-- Release notes generated/d' temp_change.md
+
+# Check if there is more than one non-empty line (the full changelog line) before we continue
+if [ $(grep -c '^[[:space:]]*[^[:space:]]' temp_change.md) -le 1 ]; then
+    echo "No changes to release $RELEASE_VERSION"
+    rm temp_change.md
+    exit 1
+fi
+
+# Remove all CR characters from all changelog files
+sed -i 's/\r//g' temp_change.md CHANGELOG.md changelog.txt
+
+# Reverse the order of lines in the file (last line becomes first, etc.)
+sed -i '1h;1d;$!H;$!d;G' temp_change.md
+# Convert "**Full Changelog**: URL" format to markdown link format "[Full Changelog](URL)"
+sed -i -re 's/\*\*Full Changelog\*\*: (.*)/\[Full Changelog\]\(\1\)\n/' temp_change.md
+# Delete everything from "## New Contributors" line to the end of file
+sed -i '/## New Contributors/,$d' temp_change.md
+# Convert GitHub changelog entries to markdown format
+# "* description by (@username1, @username2) in #1310, #1311" → "- description #1310, #1311 (@username1, @username2)"
+sed -i -re 's/^\*\s(.*)\sby\s\(?(@[^)]*[^) ])\)?\s+in\s+(.*)/- \1 \3 (\2)/' temp_change.md
+# Convert @usernames to github links
+# "(@username1, @username2)" → "([username1](https://github.com/username1), [username2](https://github.com/username2))"
+sed -i -re 's/@([a-zA-Z0-9_-]+)/[\1](https:\/\/github.com\/\1)/g' temp_change.md
+# Convert full PR URLs to linked format  
+# "https://github.com/repo/pull/1310" → "[\#1310](https://github.com/repo/pull/1310)"
+sed -i -re 's/(https:\/\/[^) ]*\/pull\/([0-9]+))/[\\#\2](\1)/g' temp_change.md
+
+# Username substitutions for preferred display names
+sed -i 's/\[Quotae/\[Quote_a/' temp_change.md
+sed -i 's/\[learn2draw/\[Lexy/' temp_change.md
+sed -i 's/\[Voronoff/\[Tom Clancy Is Dead/' temp_change.md
+sed -i 's/\[PJacek/\[TPlant/' temp_change.md
+sed -i 's/\[justjuangui/\[trompetin17/' temp_change.md
+
+cp temp_change.md changelog_temp.txt
+# Append existing CHANGELOG.md content (excluding first line) to temp_change.md
+cat CHANGELOG.md | sed '1d' >> temp_change.md
+# Create new CHANGELOG.md with header containing version and date, followed by processed changes
+printf "# Changelog\n\n## [$RELEASE_VERSION](https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/tree/$RELEASE_VERSION) ($(date +'%Y/%m/%d'))\n\n" | cat - temp_change.md > CHANGELOG.md
+# Convert changelog entries from markdown link format to simplified "* description (username)" format
+# First remove all PR links
+sed -i -re 's/( \()?\[\\#[0-9]+\]\([^)]*\),? ?\)?//g' changelog_temp.txt
+# Remove markdown link formatting from usernames in parentheses
+sed -i -re 's/\[([^]]*)\]\(https:\/\/github\.com\/[^)]*\)/\1/g' changelog_temp.txt
+# Create new changelog format: add version header, remove lines 2-3, format section headers, remove ## headers with following line, prepend to existing changelog
+echo "VERSION[${RELEASE_VERSION#v}][$(date +'%Y/%m/%d')]" | cat - changelog_temp.txt | sed '2,3d' | sed -re 's/^### (.*)/\n--- \1 ---/' | sed -e '/^##.*/,+1 d' | cat - changelog.txt > changelog_new.txt
+mv changelog_new.txt changelog.txt
+
+# Normalize line endings to CRLF for all output files to ensure consistent checksums with Windows
+sed -i 's/\r*$/\r/' CHANGELOG.md changelog.txt
+
+# Clean up temporary files
+rm temp_change.md
+rm changelog_temp.txt

.github/workflows/beta.yml

@@ -16,10 +16,36 @@ jobs:
               uses: actions/checkout@v3
               with:
                 ref: 'dev'
+                fetch-depth: 0
             - name: Configure bot user
               run: |
                 git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
                 git config --global user.name "github-actions[bot]"
+            - name: Generate Release notes
+              run: |
+                echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
+                # Delete existing beta draft if it exists
+                if gh release view beta >/dev/null 2>&1; then
+                  gh release delete beta --yes
+                fi
+                # Create new beta draft release with generated notes
+                # Make sure the latest tag is correct, even if the current commit is already tagged
+                LATEST_TAG=$(git describe --tags --abbrev=0)
+                gh release create beta --title "Beta Release" --draft --generate-notes --notes-start-tag "$LATEST_TAG"
+                gh release view beta > temp_change.md
+            - name: Tweak changelogs
+              id: tweak-changelogs
+              continue-on-error: true
+              run: |
+                # Remove carriage returns to be able to run the script
+                sed -i 's/\r$//' .github/tweak_changelogs.sh
+                chmod +x .github/tweak_changelogs.sh
+                .github/tweak_changelogs.sh beta
+            # The hash suffix will help identifying if the beta version is up-to-date
+            - name: Add commit hash suffix to manifest version
+              if: steps.tweak-changelogs.outcome == 'success'
+              run: |
+                sed -i "s/<Version number=\"\([^\"]*\)\"/<Version number=\"\1-$(git rev-parse --short HEAD)\"/g" manifest.xml
             - name: Update manifest.xml
               run: python3 update_manifest.py --quiet --in-place
             - name: Push to beta branch

.github/workflows/installer.yml

@@ -3,6 +3,11 @@ on:
   release:
     types: [published]
   workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'Tag to build'
+        required: true
+        default: 'v0.x.x'
 env:
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 jobs:
@@ -15,9 +20,12 @@ jobs:
                 repository: 'PathOfBuildingCommunity/PathOfBuilding-Installer'
                 ref: 'master'
                 ssh-key: '${{ secrets.POB_INSTALLER_KEY }}'
+            - name: Install NSIS
+              run: |
+                choco install nsis --yes
+                echo "C:\Program Files (x86)\NSIS" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
             - name: Create installer
               run: 'python3 make_release.py --game-version 2'
             - name: Upload artifact
               run: >
-                gh release upload ${{ github.event.release.tag_name }} (Get-ChildItem Dist -File).FullName --clobber -R ${{ github.repository }};
-
+                gh release upload ${{ github.event.release.tag_name || github.event.inputs.tag_name }} (Get-ChildItem Dist -File).FullName --clobber -R ${{ github.repository }};

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
           releaseVersion:
               description: 'Version number to use for this release'
               required: true
-              default: '2.x.x'
+              default: '0.x.x'
           releaseNoteUrl:
               description: 'Enter the location of edited release notes to use'
               required: false
@@ -29,27 +29,11 @@ jobs:
                 echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token;
                 gh release view $(basename ${{ github.event.inputs.releaseNoteUrl }}) > temp_change.md
             - name: Tweak changelogs
-              run: >
-                sed -i '1,10d' temp_change.md;
-                sed -i '1h;1d;$!H;$!d;G' temp_change.md;
-                sed -i -re 's/\*\*Full Changelog\*\*: (.*)/\[Full Changelog\]\(\1\)\n/' temp_change.md;
-                sed -i '/## New Contributors/,$d' temp_change.md;
-                sed -i -re 's/^\*(.*)\sby\s@(.*)\sin\s(.*\/pull\/)(.*)\r?/-\1 [\\#\4](\3\4) ([\2](https:\/\/github.com\/\2))/' temp_change.md;
-                sed -i 's/\[Quotae/\[Quote_a/' temp_change.md;
-                sed -i 's/\[learn2draw/\[Lexy/' temp_change.md;
-                sed -i 's/\[Voronoff/\[Tom Clancy Is Dead/' temp_change.md;
-                sed -i 's/\[PJacek/\[TPlant/' temp_change.md;
-                sed -i 's/\[justjuangui/\[trompetin17/' temp_change.md;
-                sed -i 's/\r//g' temp_change.md;
-                cp temp_change.md changelog_temp.txt;
-                cat CHANGELOG.md | tr \\r \\n | sed '1d' >> temp_change.md;
-                printf "# Changelog\n\n## [v${{ github.event.inputs.releaseVersion }}](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v${{ github.event.inputs.releaseVersion }}) ($(date +'%Y/%m/%d'))\n\n" | cat - temp_change.md > CHANGELOG.md;
-
-                sed -i -re 's/^- (.*) \[.*\) \(\[(.*)\]\(.*/* \1 (\2)/' changelog_temp.txt;
-                echo "VERSION[${{ github.event.inputs.releaseVersion }}][`date +'%Y/%m/%d'`]" | cat - changelog_temp.txt | tr -d \\r | sed '2,3d' | sed -re 's/^### (.*)/\n--- \1 ---/' | sed -e '/^##.*/,+1 d' | cat - changelog.txt > changelog_new.txt;
-                rm temp_change.md;
-                rm changelog_temp.txt;
-                mv changelog_new.txt changelog.txt
+              run: |
+                # Remove carriage returns to be able to run the script
+                sed -i 's/\r$//' .github/tweak_changelogs.sh
+                chmod +x .github/tweak_changelogs.sh
+                .github/tweak_changelogs.sh "v${{ github.event.inputs.releaseVersion }}"
             - name: Create Pull Request
               uses: peter-evans/create-pull-request@v5
               with:

.github/workflows/test.yml

@@ -15,4 +15,21 @@ jobs:
       - 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
+    steps:
+      - name: Install git dependency
+        run: apk add git
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Regenerate ModCache
+        env:
+          LUA_PATH: ../runtime/lua/?.lua;../runtime/lua/?/init.lua
+          REGENERATE_MOD_CACHE: 1
+        run: cd src; luajit HeadlessWrapper.lua
+      - run: git config --global --add safe.directory $(pwd)
+      - name: Check if the generated ModCache is different
+        run: git diff --exit-code src/Data/ModCache.lua