Merge branch 'feature/gcc-15' into HEAD

Author: Flamefire

.github/workflows/unit-tests.yml

@@ -78,7 +78,7 @@ jobs:
           - { compiler: clang,    os: macos-14,     type: Debug }
 
           # Linux:
-          #  Oldest Compilers 
+          #  Oldest Compilers
           #   GCC 9 also known to show a few warnings that newer versions dont show
           #   Use system cmake
           #   Use boost 1.73 (min version)
@@ -105,14 +105,66 @@ jobs:
           #   Use default boost
           #   Use (compiler) default C++ 17 standard
           #   Use default cmake
-          - { compiler: gcc-14,   os: ubuntu-24.04, type: Debug }
-          - { compiler: gcc-15,   os: ubuntu-24.04, type: Debug }
-          - { compiler: clang-18, os: ubuntu-24.04, type: Debug, externalSanitizer: true }
-          - { compiler: clang-21, os: ubuntu-latest, type: Debug, init_llvm: true}
+          - { compiler: gcc-14,   os: ubuntu-24.04,          type: Debug }
+          - { compiler: gcc-15,   container: "ubuntu:25.04", type: Debug, os: ubuntu-latest }
+          - { compiler: clang-18, os: ubuntu-24.04,          type: Debug, externalSanitizer: true }
+          - { compiler: clang-21, os: ubuntu-latest,         type: Debug, init_llvm: true}
 
     runs-on: ${{matrix.os}}
+    container: ${{matrix.container}}
+    defaults:
+      run:
+        shell: bash
 
     steps:
+      - name: Install system packages
+        run: |
+          if [[ "${{runner.os}}" =~ macOS ]]; then
+            echo "HOMEBREW_PREFIX=$HOMEBREW_PREFIX"
+            echo "HOMEBREW_CELLAR=$HOMEBREW_CELLAR"
+            brew install cmake boost sdl2 sdl2_mixer gettext miniupnpc
+            echo "Available Boost installs: $(ls "$HOMEBREW_CELLAR/boost/")"
+            # Use the latest (last folder)
+            BOOST_ROOT=$(find "$HOMEBREW_CELLAR/boost/"* -maxdepth 0 -type d | tail -n1)
+            echo "Choosen Boost: $BOOST_ROOT"
+            [[ -n "$BOOST_ROOT" ]] || exit 1
+            ls "$BOOST_ROOT/include"
+            echo "CMake config files:"
+            find "$BOOST_ROOT"/lib/cmake -type f
+            echo "BOOST_ROOT=${BOOST_ROOT}" >> $GITHUB_ENV
+          else
+            echo "DEBIAN_FRONTEND=noninteractive" >> $GITHUB_ENV
+            export DEBIAN_FRONTEND=noninteractive
+
+            if [ -n "${{matrix.container}}" ] && [ -f "/etc/debian_version" ]; then
+              apt-get -o Acquire::Retries=5 update
+              apt-get -o Acquire::Retries=5 -y -q --no-install-suggests --no-install-recommends install \
+                sudo \
+                software-properties-common \
+                bzip2 \
+                g++ \
+                git \
+                make \
+                wget
+            fi
+            compiler=${{matrix.compiler}}
+            compiler=${compiler/gcc-/g++-}
+            if [[ "${{matrix.init_llvm}}" == "true" ]]; then
+              clang_version=${compiler#clang-*}
+              wget -qO- "https://apt.llvm.org/llvm.sh" | sudo bash -s -- "${clang_version}"
+            fi
+            sudo apt-get -o Acquire::Retries=5 update
+            sudo apt-get -o Acquire::Retries=5 -y -q --no-install-suggests --no-install-recommends install \
+              cmake \
+              gettext \
+              libbz2-dev \
+              libcurl4-openssl-dev \
+              liblua5.2-dev \
+              libminiupnpc-dev \
+              libsdl2-dev libsdl2-mixer-dev \
+              $compiler
+          fi
+
       - name: Setup env and configure flags
         run: |
           echo "DEPS_DIR=${{runner.temp}}/.cache" >> $GITHUB_ENV
@@ -156,36 +208,10 @@ jobs:
           path: ${{env.DEPS_DIR}}
           key: ${{matrix.os}}-${{env.BOOST_VERSION}}
 
-      - name: Install system packages
-        run: |
-          if [[ "${{runner.os}}" =~ macOS ]]; then
-            echo "HOMEBREW_PREFIX=$HOMEBREW_PREFIX"
-            echo "HOMEBREW_CELLAR=$HOMEBREW_CELLAR"
-            brew install cmake boost sdl2 sdl2_mixer gettext miniupnpc
-            echo "Available Boost installs: $(ls "$HOMEBREW_CELLAR/boost/")"
-            # Use the latest (last folder)
-            BOOST_ROOT=$(find "$HOMEBREW_CELLAR/boost/"* -maxdepth 0 -type d | tail -n1)
-            echo "Choosen Boost: $BOOST_ROOT"
-            [[ -n "$BOOST_ROOT" ]] || exit 1
-            ls "$BOOST_ROOT/include"
-            echo "CMake config files:"
-            find "$BOOST_ROOT"/lib/cmake -type f
-            echo "BOOST_ROOT=${BOOST_ROOT}" >> $GITHUB_ENV
-          else
-            compiler=${{matrix.compiler}}
-            compiler=${compiler/gcc-/g++-}
-            if [[ "${{matrix.init_llvm}}" == "true" ]]; then
-              clang_version=${compiler#clang-*}
-              wget -qO- "https://apt.llvm.org/llvm.sh" | sudo bash -s -- "${clang_version}"
-            fi
-            sudo apt-get -o Acquire::Retries=5 update
-            sudo apt-get -o Acquire::Retries=5 -y -q --no-install-suggests --no-install-recommends install gettext libsdl2-dev libsdl2-mixer-dev libcurl4-openssl-dev libbz2-dev libminiupnpc-dev liblua5.2-dev $compiler
-          fi
-
       - name: Setup CCache
         uses: hendrikmuhs/ccache-action@v1
         with:
-          key: ${{matrix.os}}-${{matrix.compiler}}-${{matrix.type}}-${{matrix.boost}}
+          key: ${{matrix.os}}-${{matrix.container}}-${{matrix.compiler}}-${{matrix.type}}-${{matrix.boost}}
           max-size: 200M
 
       - name: Compile CMake (Linux)