Merge branch 'master' into escalation-thenea

Author: suanjiansalt

.cirrus.yml

@@ -66,5 +66,7 @@ task:
       Lint_script:
         - yarn lint
         - yarn prettier:check
+      Build_script:
+        - yarn build
       Test_script:
         - yarn test:main

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,8 @@
 name: Bug report
 about: Report a bug that you've found
 title: ""
-labels: bug
+labels: ""
+type: "Bug"
 assignees: ""
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,8 @@
 name: Feature request
 about: Request a new feature to be added
 title: ""
-labels: new feature
+labels: ""
+type: "Feature"
 assignees: ""
 ---
 

.github/pull_request_template.md

@@ -16,5 +16,5 @@ If you have not completed one of the steps below, you can create the pull reques
 When you have completed the checklist, press the "Ready for review" button.
 -->
 
--   [ ] I have run Prettier to reformat any changed files
--   [ ] I have verified my changes work
+- [ ] I have run Prettier to reformat any changed files
+- [ ] I have verified my changes work

.github/workflows/codeql.yml

@@ -18,11 +18,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ "csharp", "javascript" ]
+        language: [ "javascript" ]
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
+      with:
+        persist-credentials: false
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3

.github/workflows/locale-mod.yml

@@ -12,20 +12,21 @@ jobs:
 
     steps:
       - name: Checkout Peacock
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
+          persist-credentials: false
           token: ${{ secrets.PEACOCKBOT_TOKEN }}
           path: "./Peacock"
 
       - name: Checkout Peacock Strings
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           token: ${{ secrets.PEACOCKBOT_TOKEN }}
           repository: thepeacockproject/peacock-strings
           path: "./PeacockStrings"
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version-file: "./Peacock/.nvmrc"
           cache: "yarn"
@@ -36,17 +37,9 @@ jobs:
           cd Peacock
           yarn install --immutable
 
-      #- name: Download ResourceLib
-      #  uses: robinraju/release-downloader@v1.7
-      #  with:
-      #    repository: "OrfeasZ/ZHMTools"
-      #    latest: true
-      #    fileName: "ResourceLib-win-x64.zip"
-      #    out-file-path: "Peacock/resources"
-
       - name: Download RPKG-CLI
         id: rpkgcli
-        uses: robinraju/release-downloader@v1.11
+        uses: robinraju/release-downloader@v1.12
         with:
           repository: "glacier-modding/RPKG-Tool"
           latest: true
@@ -55,7 +48,7 @@ jobs:
 
       - name: Download HMLanguageTools
         id: hmlt
-        uses: robinraju/release-downloader@v1.11
+        uses: robinraju/release-downloader@v1.12
         with:
           repository: "AnthonyFuller/TonyTools"
           latest: true

.github/workflows/locale.yml

@@ -13,34 +13,26 @@ jobs:
 
     steps:
       - name: Checkout Peacock
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           token: ${{ secrets.PEACOCKBOT_TOKEN }}
           path: "./Peacock"
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version-file: "./Peacock/.nvmrc"
           cache: "yarn"
           cache-dependency-path: "./Peacock/yarn.lock"
-      
+
       - name: Install Packages
         run: |
           cd Peacock
           yarn install --immutable
 
-      #- name: Download ResourceLib
-      #  uses: robinraju/release-downloader@v1.7
-      #  with:
-      #    repository: "OrfeasZ/ZHMTools"
-      #    latest: true
-      #    fileName: "ResourceLib-win-x64.zip"
-      #    out-file-path: "Peacock/resources"
-
       - name: Download RPKG-CLI
         id: rpkgcli
-        uses: robinraju/release-downloader@v1.11
+        uses: robinraju/release-downloader@v1.12
         with:
           repository: "glacier-modding/RPKG-Tool"
           latest: true
@@ -49,7 +41,7 @@ jobs:
 
       - name: Download HMLanguageTools
         id: hmlt
-        uses: robinraju/release-downloader@v1.11
+        uses: robinraju/release-downloader@v1.12
         with:
           repository: "AnthonyFuller/TonyTools"
           latest: true

.github/workflows/patcher-publish.yml

@@ -0,0 +1,49 @@
+name: Patcher - Publish
+
+on:
+  workflow_dispatch:
+
+env:
+  GH_TOKEN: ${{ github.token }}
+
+jobs:
+  publish:
+    name: Publish Patcher
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+        with:
+          ref: ${{ github.ref_name }}
+          path: repository
+
+      - name: Download patcher-windows
+        run: |
+          cd repository
+          RUN_ID=$(gh run list --workflow="patcher.yml" --branch=master --limit=1 --json databaseId,status,conclusion -q 'map(select(.status == "completed" and .conclusion == "success")) | .[0].databaseId')
+
+          if [ -z "$RUN_ID" ]; then
+            echo "No run ID found"
+            exit 0
+          fi
+
+          gh run download $RUN_ID -n patcher-windows -D ../patcher-windows
+
+          if [ $? -ne 0 ]; then
+            echo "Failed to download patcher-windows"
+            exit 0
+          fi
+
+      - name: Copy patcher-windows to repository
+        run: |
+          cp -f patcher-windows/PeacockPatcher.exe repository/PeacockPatcher.exe
+
+      - name: Commit and push to repository
+        run: |
+          cd repository
+          git config user.name "PeacockBot"
+          git config user.email "admin@thepeacockproject.org"
+          git add PeacockPatcher.exe
+          git commit -m "[skip ci] Update patcher binary"
+          git push

.github/workflows/patcher.yml

@@ -8,23 +8,32 @@ on:
     branches: [ "v*", "master" ]
     paths: [ "patcher/**/*" ]
 
+env:
+  DOTNET_VERSION: 8.x
+
 jobs:
   build:
     name: Build Patcher
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v2
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: ${{ env.DOTNET_VERSION }}
 
       - name: Build Patcher
-        run: msbuild.exe patcher\HitmanPatcher.sln -t:Build -p:Configuration=Release -p:Platform=x64 -m
+        run: |
+          export DOTNET_NOLOGO=true
+          export DOTNET_CLI_TELEMETRY_OPTOUT=true
+          cd patcher
+          dotnet publish HitmanPatcher/HitmanPatcher.csproj -c Release -p DebugType=none -o Publish/Windows
 
-      - name: Upload Patcher Artifacts
+      - name: Upload patcher-windows
         uses: actions/upload-artifact@v4
         with:
           name: patcher-windows
-          path: patcher/bin/x64/Release/PeacockPatcher.exe
+          path: patcher/Publish/Windows/ILRepack