Nugget Doom post-3.2.0 + Woof! post-14.5.0 merge

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
           - name: Linux GCC
             os: ubuntu-22.04
             compiler: gcc
-            extra-options: -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF
+            extra-options: -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF
             shell: bash
 
           - name: macOS Clang
@@ -51,7 +51,8 @@ jobs:
             libopenal-dev \
             libsndfile1-dev \
             libfluidsynth-dev \
-            libxmp-dev
+            libxmp-dev \
+            libcjson-dev
 
       - name: Install dependencies (macOS)
         if: runner.os == 'macOS'
@@ -63,7 +64,8 @@ jobs:
             openal-soft \
             libsndfile \
             fluid-synth \
-            libxmp
+            libxmp \
+            cjson
 
       - name: Install dependencies (MSYS2)
         if: matrix.config.shell == 'msys2 {0}'
@@ -83,6 +85,7 @@ jobs:
             ${{ matrix.config.msys-env }}-libsndfile
             ${{ matrix.config.msys-env }}-fluidsynth
             ${{ matrix.config.msys-env }}-libxmp
+            ${{ matrix.config.msys-env }}-cjson
 
       - uses: actions/checkout@v4
 
@@ -97,6 +100,10 @@ jobs:
       - name: Build
         run: cmake --build build
 
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
       - name: Test
         if: github.event_name == 'workflow_dispatch'
         run: |
@@ -109,30 +116,75 @@ jobs:
           cd build
           cpack
 
-      - name: Upload AppImage
-        if: runner.os == 'Linux'
+      - name: Upload Artifacts
+        if: runner.os == 'Windows'
         uses: actions/upload-artifact@v4
         with:
-          name: Cherry-Doom-AppImage
-          path: build/*.appimage
+          name: MSYS2-UCRT64
+          path: build/*.zip
 
-      - name: Extract Version Number
-        if: ${{ contains(github.ref, 'tags') && runner.os == 'Linux' }}
-        shell: bash
-        run: echo "VERSION=${GITHUB_REF##*_}" >> $GITHUB_ENV
-
-  cppcheck:
-    name: Cppcheck
-    runs-on: ubuntu-latest
+  linter:
+    name: ${{ matrix.name }}
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        name: [Cppcheck , Clang-Tidy]
 
     steps:
       - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install cppcheck
+        run: |
+          sudo apt-get update
+          sudo apt-get install \
+            cppcheck \
+            ninja-build \
+            libsdl2-dev \
+            libsdl2-net-dev \
+            libopenal-dev \
+            libsndfile1-dev \
+            libfluidsynth-dev \
+            libxmp-dev \
+            libcjson-dev
 
       - uses: actions/checkout@v4
 
-      - name: Run cppcheck
-        shell: bash
+      - name: Configure
+        run: |
+          cmake -B build -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+                -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF
+
+      - name: Run Cppcheck
+        if: ${{ matrix.name == 'Cppcheck' }}
         run: |
-          cppcheck --version
-          cppcheck --error-exitcode=1 -j4 -q --force -D__GNUC__ -U_MSC_VER -U_WIN32 -Isrc opl src setup textscreen
+          mkdir cppcheck_cache
+          cppcheck -j4  --cppcheck-build-dir="cppcheck_cache" \
+            --quiet \
+            --error-exitcode=1 \
+            --check-level=exhaustive \
+            --inconclusive \
+            --inline-suppr \
+            --std=c99 \
+            --suppress="memleak:${{ github.workspace }}/src/u_scanner.c" \
+            --project="${{ github.workspace }}/build/compile_commands.json" \
+            -i"${{ github.workspace }}/third-party" \
+            -D__GNUC__
+
+      - name: Run Clang-Tidy
+        if: ${{ matrix.name == 'Clang-Tidy' }}
+        uses: cpp-linter/cpp-linter-action@v2
+        id: cpp-linter
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          version: 18
+          step-summary: true
+          files-changed-only: true
+          style: ''  # disable clang-format checks.
+          tidy-checks: >-
+            -*
+            ,clang-analyzer-*
+            ,-clang-analyzer-cplusplus*
+            ,-clang-analyzer-security*
+            ,-clang-analyzer-valist*
+          database: 'build'
+          ignore: 'third-party|win32|toolsrc|src/i_pcsound.c'

.github/workflows/packages.yml

@@ -0,0 +1,123 @@
+name: Build Packages
+
+on:
+  push:
+    branches: [ master ]
+    tags: ['*']
+    paths-ignore: ['**.md']
+  pull_request:
+    branches: [ master ]
+    paths-ignore: ['**.md']
+  workflow_dispatch:
+
+env:
+  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+
+jobs:
+  build:
+    name: ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - name: Linux GCC
+            os: ubuntu-22.04
+            toolchain: $VCPKG_INSTALLATION_ROOT
+            triplet: x64-linux-dynamic-release
+            artifact-name: Cherry-Doom-AppImage
+            artifact-path: build/*.appimage
+            extra-options: -DCMAKE_INSTALL_PREFIX=/usr
+
+          - name: MSVC x64
+            os: windows-latest
+            arch: x64
+            toolchain: ${env:VCPKG_INSTALLATION_ROOT}
+            triplet: x64-windows-static-release
+            artifact-name: Cherry-Doom-Win64
+            artifact-path: build/*.zip
+            extra-options: >-
+              -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
+              -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
+              -DCMAKE_IGNORE_PATH="C:/Strawberry/perl/bin;C:/Strawberry/c/lib"
+
+          - name: MSVC x86
+            os: windows-latest
+            arch: x86
+            toolchain: ${env:VCPKG_INSTALLATION_ROOT}
+            triplet: x86-windows-static-release
+            artifact-name: Cherry-Doom-Win32
+            artifact-path: build/*.zip
+            extra-options: >-
+              -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
+              -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
+              -DCMAKE_IGNORE_PATH="C:/Strawberry/perl/bin;C:/Strawberry/c/lib"
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          sudo sed -i 's/# deb-src/deb-src/' /etc/apt/sources.list
+          sudo apt-get update
+          sudo apt-get install ninja-build
+          sudo apt-get build-dep libsdl2-dev
+
+      - name: Developer Command Prompt
+        if: runner.os == 'Windows'
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{ matrix.config.arch }}
+
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+      - name: Configure
+        run: >-
+          cmake -B build -G Ninja
+          -DCMAKE_BUILD_TYPE=Release
+          -DENABLE_WERROR=ON -DENABLE_HARDENING=ON -DENABLE_LTO=ON
+          -DCMAKE_TOOLCHAIN_FILE="${{ matrix.config.toolchain }}/scripts/buildsystems/vcpkg.cmake"
+          -DVCPKG_OVERLAY_TRIPLETS="cmake/triplets"
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.config.triplet }}
+          ${{ matrix.config.extra-options }}
+
+      - name: Build
+        run: cmake --build build --config "Release"
+
+      - name: Test
+        if: github.event_name == 'workflow_dispatch'
+        run: |
+          cd demotest
+          pip install pyyaml joblib
+          python demotest --jobs 4 --port ../build/src/cherry-doom
+
+      - name: Package (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ github.workspace }}/build/vcpkg_installed/${{ matrix.config.triplet }}/lib"
+          cd build
+          cpack
+
+      - name: Package (Windows)
+        if: runner.os == 'Windows'
+        run: |
+          cd build
+          cpack
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.config.artifact-name }}
+          path: ${{ matrix.config.artifact-path }}
+
+      - name: Extract Version Number
+        if: ${{ contains(github.ref, 'tags') }}
+        shell: bash
+        run: echo "VERSION=${GITHUB_REF##*_}" >> $GITHUB_ENV

CHANGELOG.md

@@ -14,6 +14,8 @@
 Merged changes from [Nugget Doom 3.3.0](https://github.com/MrAlaux/Nugget-Doom/releases/tag/nugget-doom-3.3.0), note:
 - Disabled stats tracking when _Duplicate Monsters_ is enabled in the _Custom Skill_ settings
 
+Also, merged changes from Nugget Doom's [`upstream-merge`](https://github.com/MrAlaux/Nugget-Doom/tree/upstream-merge) branch, effectively bringing changes from Woof! introduced post-14.5.0, as well as Nugget Doom changes post-3.2.0.
+
 ## Changes
 
 - _Blood amount scaling with the amount of damage dealt_ is now toggleable through a setting, and is disabled by default
@@ -24,4 +26,4 @@ Merged changes from [Nugget Doom 3.3.0](https://github.com/MrAlaux/Nugget-Doom/r
 
 ## Bug Fixes
 
-- The _Disable Stats Tracking_ setting of the _Custom Skill_ not being preserved in savegames and through rewinds
+None.