Merge branch 'master' into jgrpp

# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-source.yml
#	CMakeLists.txt
#	COMPILING.md
#	src/network/network_survey.cpp
#	src/network/network_survey.h
#	src/openttd.cpp
#	src/tests/CMakeLists.txt

.github/workflows/ci-build.yml

@@ -90,20 +90,20 @@ jobs:
         - name: Clang
           compiler: clang
           cxxcompiler: clang++
-          libraries: libsdl2-dev nlohmann-json3-dev
+          libraries: libsdl2-dev
         - name: GCC - SDL2
           compiler: gcc
           cxxcompiler: g++
-          libraries: libsdl2-dev nlohmann-json3-dev
+          libraries: libsdl2-dev
         - name: GCC - SDL1.2
           compiler: gcc
           cxxcompiler: g++
-          libraries: libsdl1.2-dev nlohmann-json3-dev
+          libraries: libsdl1.2-dev
         - name: GCC - Dedicated
           compiler: gcc
           cxxcompiler: g++
           extra-cmake-parameters: -DOPTION_DEDICATED=ON -DCMAKE_CXX_FLAGS_INIT="-DRANDOM_DEBUG"
-          # Compile without SDL / SDL2 / nlohmann-json, as that should compile fine too.
+          # Compile without SDL / SDL2, as that should compile fine too.
 
     name: Linux (${{ matrix.name }})
 
@@ -139,6 +139,7 @@ jobs:
           liblzma-dev \
           libzstd-dev \
           liblzo2-dev \
+          nlohmann-json3-dev \
           ${{ matrix.libraries }} \
           zlib1g-dev \
           # EOF

.github/workflows/release-source.yml

@@ -152,14 +152,18 @@ jobs:
     - name: Generate survey key
       id: survey_key
       run: |
-        #PAYLOAD='{"version":"${{ steps.metadata.outputs.version }}","type":"${{ vars.SURVEY_TYPE }}"}'
-        #
-        #echo "${{ secrets.SURVEY_SIGNING_KEY }}" > survey_signing_key.pem
-        #SIGNATURE=$(echo -n "${PAYLOAD}" | openssl dgst -sha256 -sign survey_signing_key.pem | base64 -w0)
-        #rm -f survey_signing_key.pem
-        #
-        #SURVEY_KEY=$(curl -f -s -X POST -d "${PAYLOAD}" -H "Content-Type: application/json" -H "X-Signature: ${SIGNATURE}" https://survey-participate.openttd.org/create-survey-key/${{ vars.SURVEY_TYPE }})
-        SURVEY_KEY=""
+        if [ -z "${{ vars.SURVEY_TYPE }}" ]; then
+          echo "SURVEY_TYPE variable not found; most likely running in a fork. Skipping step."
+          SURVEY_KEY=""
+        else
+          PAYLOAD='{"version":"${{ steps.metadata.outputs.version }}","type":"${{ vars.SURVEY_TYPE }}"}'
+
+          echo "${{ secrets.SURVEY_SIGNING_KEY }}" > survey_signing_key.pem
+          SIGNATURE=$(echo -n "${PAYLOAD}" | openssl dgst -sha256 -sign survey_signing_key.pem | base64 -w0)
+          rm -f survey_signing_key.pem
+
+          SURVEY_KEY=$(curl -f -s -X POST -d "${PAYLOAD}" -H "Content-Type: application/json" -H "X-Signature: ${SIGNATURE}" https://survey-participate.openttd.org/create-survey-key/${{ vars.SURVEY_TYPE }})
+        fi
 
         echo "survey_key=${SURVEY_KEY}" >> $GITHUB_OUTPUT
 

.github/workflows/release-windows.yml

@@ -73,6 +73,13 @@ jobs:
           zstd \
           # EOF
 
+        # arm64-windows-static is not (yet) supported for breakpad.
+        if [ "${{ matrix.arch }}" != "arm64" ]; then
+          vcpkg install --triplet=${{ matrix.arch }}-windows-static \
+            breakpad \
+            # EOF
+        fi
+
     - name: Install MSVC problem matcher
       uses: ammaraskar/msvc-problem-matcher@master