Merge branch 'main' into fix-npc_at_om_location

.github/semantic.yml

@@ -44,6 +44,7 @@ scopes:
   - mods/No_Rail_Stations
   - mods/Old_Mutations
   - mods/Only_Wildlife
+  - mods/pride_flags
   - mods/RL_Classes
   - mods/StatsThroughSkills
   - mods/UDP_BN_FAKE_SNOW

.github/workflows/android.yml

@@ -29,12 +29,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
       - name: Set up JDK 11 (android)
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.1.0
         with:
           java-version: "11"
           distribution: "adopt"

.github/workflows/autofix.yml

@@ -17,7 +17,7 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - run: sudo apt-get install astyle
 

.github/workflows/clang-tidy.yml

@@ -41,7 +41,7 @@ jobs:
 
     steps:
       - name: checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: install dependencies
@@ -53,6 +53,13 @@ jobs:
             libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev libsdl2-mixer-dev libpulse-dev ccache \
             libflac-dev gettext
 
+      - name: add problem matcher
+        run: |
+          # Enable GitHub actions problem matchers
+          # (See https://github.com/actions/toolkit/blob/master/docs/problem-matchers.md)
+          echo "::add-matcher::build-scripts/problem-matchers/catch2.json"
+          echo "::add-matcher::build-scripts/problem-matchers/debugmsg.json"
+
       - name: prepare
         run: bash ./build-scripts/requirements.sh
       - uses: ammaraskar/gcc-problem-matcher@master

.github/workflows/documentation.yml

@@ -22,7 +22,7 @@ jobs:
     environment: github-pages
     steps:
       - name: Checkout your repository using git
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install, build, and upload site
         uses: withastro/action@v0
         with:

.github/workflows/i18n-extraction.yml

@@ -21,7 +21,7 @@ jobs:
           sudo apt-get install gettext python3-pip
           sudo pip3 install polib luaparser
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Check that translation template extraction works
         run: lang/update_pot.sh

.github/workflows/i18n-printf-format.yml

@@ -16,7 +16,7 @@ jobs:
           sudo apt-get install python3-pip
           sudo pip3 install polib
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: "Check printf format string in translations"
         run: ./tools/check_po_printf_format.py

.github/workflows/manual-release.yml

@@ -27,38 +27,38 @@ jobs:
           echo "release_name=Cataclysm-BN ${{ env.VERSION }}" >> $GITHUB_OUTPUT
       - name: Check if there is existing git tag
         id: tag_check
-        uses: mukunku/tag-exists-action@v1.4.0
+        uses: mukunku/tag-exists-action@v1.6.0
         with:
           tag: ${{ steps.generate_env_vars.outputs.tag_name }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Push tag
         id: tag_version
-        uses: mathieudutour/github-tag-action@v5.5
+        uses: mathieudutour/github-tag-action@v6.2
         if: ${{ steps.tag_check.outputs.exists == 'false' }}
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           custom_tag: ${{ steps.generate_env_vars.outputs.tag_name }}
           tag_prefix: ""
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: git fetch origin tag ${{ steps.generate_env_vars.outputs.tag_name }} --no-tags
       - name: Build Changelog
         id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v2.1.0
+        uses: mikepenz/release-changelog-builder-action@v4.2.0
         with:
           configuration: "changelog.json"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Create release
         id: create_release
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@v2.0.2
         if: ${{ steps.tag_check.outputs.exists == 'false' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ steps.generate_env_vars.outputs.tag_name }}
-          release_name: ${{ steps.generate_env_vars.outputs.release_name }}
+          name: ${{ steps.generate_env_vars.outputs.release_name }}
           body: |
             ${{ steps.build_changelog.outputs.changelog }}
             These are the outputs for the manually triggered build of commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }})
@@ -155,7 +155,7 @@ jobs:
     env:
       ZSTD_CLEVEL: 17
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Create VERSION.TXT
         shell: bash
         run: |
@@ -165,6 +165,17 @@ jobs:
           commit sha: ${{ github.sha }}
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
+
+      - name: Setup msys2 (windows msvc)
+        if: runner.os == 'Windows'
+        uses: msys2/setup-msys2@v2
+        with: { msystem: mingw64, install: gettext }
+
+      - name: Compile translations (windows msvc)
+        if: runner.os == 'Windows'
+        shell: msys2 {0}
+        run: lang/compile_mo.sh all
+
       - name: Install dependencies (windows msvc) (1/3)
         if: runner.os == 'Windows'
         uses: microsoft/setup-msbuild@v1.3.1
@@ -214,11 +225,7 @@ jobs:
         run: |
           HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ccache parallel
           pip3 install mac_alias==2.2.0 dmgbuild==1.6.1 biplist
-      - name: Compile translations (windows)
-        if: runner.os == 'Windows'
-        shell: bash
-        run: |
-          lang/compile_mo.sh all
+
       - name: Build CBN (linux)
         if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none'
         run: |
@@ -246,7 +253,7 @@ jobs:
           mv CataclysmBN-${{ env.VERSION }}.dmg cbn-${{ matrix.artifact }}-${{ env.VERSION }}.dmg
       - name: Set up JDK 11 (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.1.0
         with:
           java-version: "11"
           distribution: "adopt"
@@ -279,7 +286,7 @@ jobs:
           fi
       - name: Upload release asset
         id: upload-release-asset
-        uses: actions/upload-release-asset@v1
+        uses: shogo82148/actions-upload-release-asset@v1.7.4
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/matrix.yml

@@ -147,7 +147,7 @@ jobs:
     steps:
       - name: checkout repository
         if: ${{ env.SKIP == 'false' }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
@@ -182,6 +182,15 @@ jobs:
 
           HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ccache parallel
 
+      # problem matchers are only ran on GCC to reduce error spam
+      - name: add problem matcher
+        if: ${{ matrix.always-run == true }}
+        run: |
+          # Enable GitHub actions problem matchers
+          # (See https://github.com/actions/toolkit/blob/master/docs/problem-matchers.md)
+          echo "::add-matcher::build-scripts/problem-matchers/catch2.json"
+          echo "::add-matcher::build-scripts/problem-matchers/debugmsg.json"
+
       - name: prepare
         if: ${{ env.SKIP == 'false' }}
         run: bash ./build-scripts/requirements.sh

.github/workflows/msvc-full-features-cmake.yml

@@ -53,7 +53,7 @@ jobs:
 
     steps:
     - name: checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
 

.github/workflows/msys2-cmake.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1