Merge remote-tracking branch 'upstream/master'

.devcontainer/graphical/Dockerfile

@@ -0,0 +1,9 @@
+FROM mcr.microsoft.com/devcontainers/cpp:0-ubuntu-22.04
+
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends libsdl2-dev libsdl2-ttf-dev libharfbuzz-dev \
+    libsdl2-image-dev libjpeg-turbo8-dev libtiff-dev libwebp-dev libzip-dev libzstd-dev \
+    libsdl2-mixer-dev libflac-dev libasound2-dev libfreetype6-dev build-essential astyle ccache
+
+# [Optional] comment out this section unless you want to compile the Object Creator. Install some QT libraries
+RUN apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools

.devcontainer/graphical/devcontainer.json

@@ -0,0 +1,34 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/cpp
+{
+  "name": "Standard + Qt5",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "github.vscode-github-actions",
+        "ms-vscode.makefile-tools",
+        "ms-vscode.cpptools-extension-pack",
+        "EditorConfig.EditorConfig",
+        "chiehyu.vscode-astyle"
+      ]
+    }
+  }
+
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  // "features": {},
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "gcc -v",
+
+  // Configure tool-specific properties.
+  // "customizations": {},
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}

.github/workflows/CBA.yml

@@ -13,7 +13,7 @@ jobs:
   build:
     runs-on: ubuntu-latest    
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install dependencies
       run: sudo apt-get install libncursesw5-dev gettext
     - name: Prepare Build Analyzer

.github/workflows/assign_mission_target_needs_om_special.yml

@@ -12,5 +12,5 @@ jobs:
   run-the-tool:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: ./tools/json_tools/assign_mission_target_needs_om_special.bash 2>&1

.github/workflows/astyle.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: install dependencies
       run: sudo apt-get install astyle

.github/workflows/check-translation.yml

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

.github/workflows/clang-tidy.yml

@@ -79,7 +79,7 @@ jobs:
           ln -s /usr/bin/FileCheck-16 ~/llvm-command-override/FileCheck
           echo "$HOME/llvm-command-override" >> $GITHUB_PATH
     - name: checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: prepare
       run: bash ./build-scripts/requirements.sh
     - name: determine changed files

.github/workflows/cmake-format.yml

@@ -23,7 +23,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install cmakelang
       run: python3 -m pip install -U cmakelang
     - name: run cmake-lint

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/comment-commands.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set-up Comvent
         uses: rytswd/[email protected]
@@ -62,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set-up Comvent
         uses: rytswd/[email protected]

.github/workflows/emscripten.yml

@@ -39,16 +39,48 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: mymindstorm/setup-emsdk@v13
 
     - name: Prepare web data
       run: ./build-scripts/prepare-web-data.sh
 
+    - name: Install ccache
+      run: |
+        sudo apt-get update
+        sudo apt-get install ccache
+
+    - name: Get ccache vars
+      id: get-vars
+      run: |
+        echo "datetime=$(/bin/date -u "+%Y%m%d%H%M")" >> $GITHUB_OUTPUT
+        echo "ccache-path=$(echo '~/.cache/ccache')" >> $GITHUB_OUTPUT
+
+    - name: ccache cache files
+      uses: actions/cache@v4
+      with:
+        path: ${{ steps.get-vars.outputs.ccache-path }}
+        # double-dash after compiler is not a typo, it is to disambiguate between g++-<date> and g++-11-<date> for restore key prefix matching
+        key: ccache-${{ github.ref_name }}-emscripten--${{ steps.get-vars.outputs.datetime }}
+        restore-keys: |
+          ccache-master-emscripten--
+
     - name: Build with emcc (emscripten)
       run: ./build-scripts/build-emscripten.sh
 
+    - name: post-build ccache manipulation
+      run: |
+        ccache --show-stats --verbose
+        ccache -M 4G
+        ccache -c
+        ccache --show-stats --verbose
+
+    - name: clear ccache on PRs
+      if: ${{ github.ref_name != 'master' && !failure() }}
+      run: |
+        ccache -C
+
     - name: Assemble web bundle
       run: ./build-scripts/prepare-web.sh
 

.github/workflows/flake8.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install dependencies
       run: sudo apt-get install flake8
     - name: Enable flake8 problem matcher

.github/workflows/format_emscripten.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: install dependencies (ubuntu)
         run: |
@@ -36,7 +36,7 @@ jobs:
           name: formatter
           path: formatter.html
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: gh-pages
 
@@ -54,7 +54,6 @@ jobs:
           commit-message: JSON linter gh-pages file update
           base: gh-pages
           branch: gh-pages-json-linter-update
-          branch-suffix: short-commit-hash
           delete-branch: true
           add-paths: formatter.html
           title: Update Github Pages JSON linter page

.github/workflows/json.yml

@@ -28,7 +28,7 @@ jobs:
     if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: JSON style check
       run: make style-all-json-parallel RELEASE=1
     - name: Display Corrections

.github/workflows/label-first-time-contributor.yml

@@ -13,7 +13,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Check if user has any merged PRs in this reposiory
         id: pr-check

.github/workflows/linter.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         ref: '${{ github.event.pull_request.head.sha }}'
 

.github/workflows/matrix.yml

@@ -246,7 +246,7 @@ jobs:
     steps:
     - name: checkout repository
       if: ${{ env.SKIP == 'false' }}
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: install dependencies (ubuntu)
       if: ${{ env.SKIP == 'false' && runner.os == 'Linux' }}
       run: |
@@ -299,7 +299,7 @@ jobs:
       shell: bash
     - name: ccache cache files
       if: ${{ env.SKIP == 'false' && ( runner.os == 'Linux' || runner.os == 'macOS' ) }}
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ steps.get-vars.outputs.ccache-path }}
         # double-dash after compiler is not a typo, it is to disambiguate between g++-<date> and g++-11-<date> for restore key prefix matching

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

@@ -57,7 +57,7 @@ jobs:
     runs-on: windows-2019
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Add msbuild to PATH
       uses: microsoft/[email protected]
@@ -105,7 +105,7 @@ jobs:
       shell: bash
 
     - name: ccache cache files
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ steps.get-vars.outputs.ccache-path }}
         # double-dash after compiler is not a typo, it is to disambiguate between g++-<date> and g++-11-<date> for restore key prefix matching

.github/workflows/pull-translations.yml

@@ -29,7 +29,7 @@ jobs:
               console.log(error)
             }
       - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Get current date"
         uses: josStorer/[email protected]
         id: current-date

.github/workflows/push-translation-template.yml

@@ -31,7 +31,7 @@ jobs:
           sudo apt install python3-pip
           sudo pip3 install polib
       - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Generate translation template"
         run: |
           lang/update_pot.sh

.github/workflows/release.yml

@@ -38,7 +38,7 @@ jobs:
         run: |
           echo "tag_name=cdda-experimental-${{ steps.get-timestamp.outputs.time }}" >> $GITHUB_OUTPUT
           echo "release_name=Cataclysm-DDA experimental build ${{ steps.get-timestamp.outputs.time }}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           gh release create ${{ steps.generate_env_vars.outputs.tag_name }} --generate-notes --prerelease --title "${{ steps.generate_env_vars.outputs.release_name }}"
 
@@ -175,7 +175,7 @@ jobs:
     env:
         ZSTD_CLEVEL: 17
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get soundpack
         if: matrix.sound == 1
         run: |
@@ -232,7 +232,7 @@ jobs:
       - name: Install build dependencies (mac)
         if: runner.os == 'macOS'
         run: |
-          HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install gettext ccache parallel
+          HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install gettext ccache parallel dylibbundler
           pip3 install dmgbuild biplist
       - name: Create VERSION.TXT
         shell: bash
@@ -281,8 +281,9 @@ jobs:
         if: matrix.artifact == 'windows-objectcreator-x64'
         uses: devcontainers/[email protected]
         with:
-          imageName: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer
-          cacheFrom: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer
+          imageName: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer-cross-compile
+          cacheFrom: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer-cross-compile
+          configFile: ./.devcontainer/cross-compile/devcontainer.json
           push: always
           runCmd: |
             git config --global --add safe.directory /workspaces/Cataclysm-DDA
@@ -291,9 +292,10 @@ jobs:
         if: matrix.artifact == 'linux-objectcreator-x64'
         uses: devcontainers/[email protected]
         with:
-          imageName: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer
-          cacheFrom: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer
-          push: never
+          imageName: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer-graphical
+          cacheFrom: ghcr.io/cleverraven/cataclysm-dda/cataclysm-dda-devcontainer-graphical
+          configFile: ./.devcontainer/graphical/devcontainer.json
+          push: always
           runCmd: |
             git config --global --add safe.directory /workspaces/Cataclysm-DDA
             make -j$((`nproc`+0)) TILES=1 LINTJSON=0 RELEASE=1 object_creator

.github/workflows/summary-labeler.yml

@@ -8,7 +8,7 @@ jobs:
     name: labeler
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: fuxingloh/multi-labeler@main
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/text-changes-analyzer.yml

@@ -28,7 +28,7 @@ jobs:
           sudo apt-get install python3-pip gettext
           sudo pip3 install polib pyspellchecker
       - name: "Checkout test merge commit"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Compute base commit and test merge commit"
         id: get-commit-hash
         run: |
@@ -41,7 +41,7 @@ jobs:
           ./lang/update_pot.sh
           cp lang/po/cataclysm-dda.pot ~/merge.pot
       - name: "Checkout base commit"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ steps.get-commit-hash.outputs.base_commit }}
       - name: "Generate translation template on base commit"
@@ -50,7 +50,7 @@ jobs:
           ./lang/update_pot.sh
           cp lang/po/cataclysm-dda.pot ~/base.pot
       - name: "Checkout test merge commit"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ steps.get-commit-hash.outputs.test_merge_commit }}
       - name: "List text changes"

.github/workflows/toc.yml

@@ -14,7 +14,7 @@ jobs:
     name: Update the table of contents
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: npx doctoc doc/JSON_INFO.md --github
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v4

.github/workflows/update-tilesets.yml

@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'CleverRaven/Cataclysm-DDA'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: "Get current date"
         uses: 1466587594/get-current-time@v2
         id: current-date