Merge pull request #17 from PathOfBuildingCommunity/dev

[pull] dev from PathOfBuildingCommunity:dev

Author: deathbeam

.busted

@@ -8,6 +8,7 @@ return {
         lpath = "../runtime/lua/?.lua;../runtime/lua/?/init.lua",
         helper = "HeadlessWrapper.lua",
         ROOT = { "../spec" },
+       	["exclude-tags"] = "builds",
     },
     generate = {
         directory = "src",

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -33,7 +33,7 @@ body:
     id: actual
     attributes:
       label: What is the actual behaviour/value?
-      description: Please write a a clear and concise description of what actually happens.
+      description: Please write a clear and concise description of what actually happens.
       placeholder: E.g. When I'm hovering over [...], PoB displays [...].
     validations:
       required: true
@@ -53,9 +53,9 @@ body:
   - type: textarea
     id: build_code
     attributes:
-      label: Build code
+      label: Character build code
       description: Always provide a build code that exhibits the bug you want to report, even if it is not specific to a particular build. This helps us greatly to reproduce bugs faster.
-      placeholder: Build codes can be either Base64 encoded text, or pastebin.com links to this text.
+      placeholder: This can be either a code copied from the "Import/Export Build" tab or a link to a shared build.
       render: shell
     validations:
       required: true
@@ -64,6 +64,6 @@ body:
     attributes:
       label: Screenshots
       description: If you receive an error or experience graphical bugs, include one or multiple screenshots. GIFs or short videos are also okay, if the bug cannot be displayed in a still image.
-      placeholder: In this text area, you can attach files directly, or link to them if they're hosted elsewhere instead.
+      placeholder: In this text area, you can attach files directly or link to them if they're hosted elsewhere instead.
     validations:
       required: false

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -26,7 +26,7 @@ body:
     id: solution
     attributes:
       label: Describe the solution you'd like
-      description: Please write a a clear and concise description of what you want to happen.
+      description: Please write a clear and concise description of what you want to happen.
       placeholder: E.g. When I'm creating a new item, there should be an option to [...].
     validations:
       required: true

.github/release.yml

@@ -9,12 +9,21 @@ changelog:
     authors:
       - github-actions
   categories:
-    - title: Implemented Enhancements
+    - title: New to Path of Building
       labels:
         - enhancement
+    - title: User Interface
+      labels:
+        - user-interface
+    - title: Accuracy Improvements
+      labels:
+        - bug:accuracy
+        - bug:behavior
+        - bug:calculation
     - title: Fixed Bugs
       labels:
         - bug
+        - crash
     - title: Other changes
       labels:
-        - "*"
+        - "*"

.github/workflows/beta.yml

@@ -2,56 +2,27 @@ name: Push beta branch
 on: 
   schedule:
     - cron: '0 0 * * 5'
+  push:
+    branches:
+      - 'master'
   workflow_dispatch:
 jobs:
   push-beta:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
+            - name: Set line endings
+              run: git config --global core.autocrlf true
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
               with:
-                ref: 'beta'
-            - name: Fetch tags
-              run: git fetch --prune --unshallow --tags
-            - name: Get current date
-              id: date
-              run: echo "::set-output name=date::$(date +'%Y/%m/%d')"
-            - name: Get current version
-              id: current-version
-              run: echo "::set-output name=ver::$(git describe --tags --abbrev=0 | sed 's/^.//')"
-            - name: Get next version
-              id: next-version
-              run: |
-                ver=`git describe --tags --abbrev=0`
-                major=$(echo $ver | sed -r 's/^v([0-9]+)\.([0-9]+)\.([0-9]+)/\1/')
-                minor=$(echo $ver | sed -r 's/^v([0-9]+)\.([0-9]+)\.([0-9]+)/\2/')
-                patch=$(echo $ver | sed -r 's/^v([0-9]+)\.([0-9]+)\.([0-9]+)/\3/')
-                let minor+=1
-                semVer="$major.$minor.$patch"
-                echo "::set-output name=ver::$(echo $semVer)"
-            - name: Update from dev
+                ref: 'dev'
+            - 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]"
-                git rebase -X ours origin/dev
-            - name: Install changelog generator
-              run: sudo gem install github_changelog_generator --version 1.15.2
-            - name: Generate Release notes
-              run: github_changelog_generator --user ${{ github.repository_owner }} --project $(echo '${{ github.repository }}' | awk -F '/' '{print $2}') -t ${{ secrets.GITHUB_TOKEN }} --output temp_change.md --release-branch dev --exclude-labels invalid,duplicate --future-release ${{ steps.next-version.outputs.ver }} --since-tag `echo v${{ steps.current-version.outputs.ver }}` --max-issues 0 --no-issues true --date-format %Y/%m/%d
-            - name: Tweak changelogs
-              run: |
-                sed -i '$d' temp_change.md
-                sed -i 's/\[Quotae\]/\[Quote_a\]/' temp_change.md
-                sed -i 's/\[learn2draw\]/\[Lexy\]/' temp_change.md;
-                sed -i 's/\[Voronoff\]/\[tcid\]/' temp_change.md;
-                echo "VERSION[${{ steps.current-version.outputs.ver }}][${{ steps.date.outputs.date }}]" | cat - temp_change.md | sed '2,6d' | sed -e '/^\*\*.*/,+1 d' | sed -r 's/\[\\#.* \(\[(.*)\]\(.*/\(\1\)/' | sed 's/^-/*/' | cat - changelog.txt > changelog_new.txt
-                cat CHANGELOG.md | sed '1d' >> temp_change.md
-                mv temp_change.md CHANGELOG.md
-                mv changelog_new.txt changelog.txt
             - name: Update manifest.xml
-              run: python3 update_manifest.py --quiet --in-place --set-version=${{ steps.next-version.outputs.ver }}
-              
+              run: python3 update_manifest.py --quiet --in-place
             - name: Push to beta branch
               run: |
-                  git commit -am "Weekly beta-${{ steps.current-version.outputs.ver }} release" --allow-empty --author="github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
-                  git push origin beta
+                  git commit -am "Weekly beta release" --allow-empty --author="github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
+                  git push origin HEAD:beta --force

.github/workflows/installer.yml

@@ -0,0 +1,21 @@
+name: Create new installer
+on:
+  release:
+    types: [published]
+jobs:
+  release:
+    runs-on: windows-latest
+    steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+              with:
+                repository: 'PathOfBuildingCommunity/PathOfBuilding-Installer'
+                ref: 'master'
+                ssh-key: '${{ secrets.POB_INSTALLER_KEY }}'
+            - name: Create installer
+              run: 'python3 make_release.py'
+            - name: Upload artifact
+              run: >
+                echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token;
+                gh release upload ${{ github.event.release.tag_name }} (Get-ChildItem Dist -File).FullName --clobber -R ${{ github.repository }};
+

.github/workflows/release.yml

@@ -6,6 +6,9 @@ on:
               description: 'Version number to use for this release'
               required: true
               default: '2.x.x'
+          releaseNoteUrl:
+              description: 'Enter the location of edited release notes to use'
+              required: false
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -15,23 +18,32 @@ jobs:
               with:
                 ref: 'dev'
             - name: Generate Release notes
+              if: ${{ github.event.inputs.releaseNoteUrl == '' }}
               run: >
                 echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token;
                 gh release view $(basename $(gh release create v${{ github.event.inputs.releaseVersion }} --title "Release ${{ github.event.inputs.releaseVersion }}" --draft --generate-notes)) > temp_change.md
+            - name: Use existing Release notes
+              if: ${{ github.event.inputs.releaseNoteUrl != '' }}
+              run: >
+                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,8d' 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\/)(.*)/-\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;
                 cp temp_change.md changelog_temp.txt;
                 cat CHANGELOG.md | 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 's/Quotae/Quote_a/' changelog_temp.txt;
-                sed -i 's/learn2draw/Lexy/' changelog_temp.txt;
-                sed -i 's/Voronoff/Tom Clancy Is Dead/' changelog_temp.txt;
-                echo "VERSION[${{ github.event.inputs.releaseVersion }}][`date +'%Y/%m/%d'`]" | cat - changelog_temp.txt | sed '2,4d' | sed -e '/^##.*/,+1 d' | sed -r 's/by @(.*) in http.*/\(\1\)/' | cat - changelog.txt > changelog_new.txt;
+                sed -i -re 's/^- (.*) \[.*\) \(\[(.*)\]\(.*/* \1 (\2)/' changelog_temp.txt;
+                echo "VERSION[${{ github.event.inputs.releaseVersion }}][`date +'%Y/%m/%d'`]" | cat - changelog_temp.txt | sed '2,3d' | sed -re 's/^### (.*)\r/--- \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

.gitignore

@@ -27,3 +27,6 @@ src/Export/ggpk/Metadata/
 src/Export/ggpk/Data/
 src/Export/ggpk/*.exe
 src/Export/ggpk/*.dll
+
+# Timeless Jewels
+src/Data/TimelessJewelData/*.bin