Merge pull request #225 from OpenBrickProtocolFoundation/assert_ci_compiler_version

Totto16 · web-flow · commit ece7d318b879 · 2025-05-14T23:47:38.000+02:00
feat: Assert CI compiler version
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -50,7 +50,7 @@ jobs:
 
       - name: Build native libraries
         run: |
-          bash ./platforms/build-android.sh ${{ matrix.config.arch }} complete_rebuild release
+          bash ./platforms/build-android.sh ${{ matrix.config.arch }} complete_rebuild release CI
           cp -r ./assets/ platforms/android/app/src/main
 
       - name: Build APK
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,41 +21,47 @@ jobs:
             environment: msvc
             shell: pwsh
             static: false
+            fatal_warnings: false # TODO: enable fatal warnings, once cpp-httplib is patched either by ourselves or by the maintainers
 
           - name: Windows MSVC (static)
             os: windows
             os-version: 2022
             environment: msvc
             shell: pwsh
             static: true
+            fatal_warnings: false # TODO: enable fatal warnings, once cpp-httplib is patched either by ourselves or by the maintainers
 
           - name: Windows MingGW
             os: windows
             os-version: 2022
             environment: mingw
             architecture: x86_64
             shell: 'msys2 {0}'
+            fatal_warnings: true
 
           - name: Windows UCRT
             os: windows
             os-version: 2022
             environment: ucrt
             architecture: ucrt-x86_64
             shell: 'msys2 {0}'
+            fatal_warnings: true
 
           - name: Linux (ARM64)
             os: ubuntu
             os-version: 24.04-arm
             use-clang: false
             arm: true
             shell: bash
+            fatal_warnings: true
 
           - name: Linux
             os: ubuntu
             os-version: 24.04
             use-clang: false
             arm: false
             shell: bash
+            fatal_warnings: true
 
           - name: Linux Clang (libstdc++)
             os: ubuntu
@@ -64,6 +70,7 @@ jobs:
             use-clang_stdlib: false
             arm: false
             shell: bash
+            fatal_warnings: true
 
           - name: Linux Clang (libc++)
             os: ubuntu
@@ -72,18 +79,21 @@ jobs:
             use-clang_stdlib: true
             arm: false
             shell: bash
+            fatal_warnings: true
 
           - name: MacOS
             os: macos
             os-version: 13
             arm: false
             shell: bash
+            fatal_warnings: true
 
           - name: MacOS (Arm64)
             os: macos
             os-version: 14
             arm: true
             shell: bash
+            fatal_warnings: true
 
     defaults:
       run:
@@ -199,7 +209,7 @@ jobs:
           brew install sdl2 sdl2_ttf sdl2_mixer sdl2_image
 
       - name: Configure
-        run: meson setup build -Dbuildtype=release -Ddefault_library=${{( matrix.config.os == 'windows' && matrix.config.environment == 'msvc' && matrix.config.static ) && 'static' ||'shared' }} -Dclang_libcpp=${{ ( ( matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) || matrix.config.os == 'macos' ) && 'enabled' || 'disabled' }}
+        run: meson setup build -Dbuildtype=release -Ddefault_library=${{( matrix.config.os == 'windows' && matrix.config.environment == 'msvc' && matrix.config.static ) && 'static' ||'shared' }} -Dclang_libcpp=${{ ( ( matrix.config.os == 'ubuntu' && matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) || matrix.config.os == 'macos' ) && 'enabled' || 'disabled' }} -Drun_in_ci=true ${{( matrix.config.fatal_warnings ) && '--fatal-meson-warnings' || '' }}
 
       - name: Build
         run: meson compile -C build
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: flathub-infra/flatpak-github-actions/flatpak-builder@9386d85446c0f8c6b93dea3774002af2abcac3d5
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           bundle: oopetris.flatpak
           manifest-path: io.github.openbrickprotocolfoundation.oopetris.yml
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -34,7 +34,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install ninja-build libsdl2-2.0-0 libsdl2-dev libsdl2-ttf* libsdl2-mixer* libsdl2-image* desktop-file-utils -y --no-install-recommends
 
-          meson setup build -Dbuildtype=release -Dclang_libcpp=disabled -Dtests=true
+          meson setup build -Dbuildtype=release -Dclang_libcpp=disabled -Dtests=true -Drun_in_ci=true --fatal-meson-warnings
           meson compile -C build git_version.hpp
 
       - uses: cpp-linter/cpp-linter-action@v2
diff --git a/.github/workflows/musl.yml b/.github/workflows/musl.yml
@@ -41,7 +41,7 @@ jobs:
           fetch-depth: '0'
   
       - name: Configure
-        run: meson setup build -Dbuildtype=release -Ddefault_library=shared -Dclang_libcpp=${{ ( matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) && 'enabled' || 'disabled' }}
+        run: meson setup build -Dbuildtype=release -Ddefault_library=shared -Dclang_libcpp=${{ ( matrix.config.use-clang == true && matrix.config.use-clang_stdlib ) && 'enabled' || 'disabled' }} -Drun_in_ci=true --fatal-meson-warnings
 
       - name: Build
         run: meson compile -C build
diff --git a/.github/workflows/nintendo.yml b/.github/workflows/nintendo.yml
@@ -11,18 +11,20 @@ jobs:
     name: Nintendo ${{ matrix.config.name }} CI
     runs-on: ubuntu-24.04
     container:
-      image: devkitpro/${{ matrix.config.container }} ## base on debian:buster-slim
+      image: devkitpro/${{ matrix.config.container }}:${{ matrix.config.revision }} ## based on debian:buster-slim
     strategy:
       fail-fast: false
       matrix:
         config:
           - name: 3ds
             extension: 3dsx
             container: devkitarm
+            revision: "20250102"
 
           - name: switch
             extension: nro
             container: devkita64
+            revision: "20241023"
 
     steps:
       - uses: actions/checkout@v4
@@ -43,7 +45,7 @@ jobs:
 
       - name: Configure and Build
         run: |
-          bash ./platforms/build-${{ matrix.config.name }}.sh complete_rebuild release
+          bash ./platforms/build-${{ matrix.config.name }}.sh complete_rebuild release CI
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
           sudo apt-get install ninja-build libsdl2-2.0-0 libsdl2-dev libsdl2-ttf* libsdl2-mixer* libsdl2-image* gcovr desktop-file-utils -y --no-install-recommends
 
       - name: Configure
-        run: meson setup build -Dbuildtype=debug -Db_coverage=true -Dtests=true -Dclang_libcpp=enabled
+        run: meson setup build -Dbuildtype=debug -Db_coverage=true -Dtests=true -Dclang_libcpp=enabled -Drun_in_ci=true --fatal-meson-warnings
 
       - name: Run tests
         run: meson test -C build --verbose
diff --git a/.github/workflows/web_build.yml b/.github/workflows/web_build.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Build
         run: |
-          ENABLE_TESTING=1 bash ./platforms/build-web.sh
+          ENABLE_TESTING=1 bash ./platforms/build-web.sh complete_rebuild release CI
 
       # TODO upload page to gh-pages!
       - name: Upload artifacts
diff --git a/.github/workflows/windows_installer.yml b/.github/workflows/windows_installer.yml
@@ -41,7 +41,8 @@ jobs:
         run: 7z x "-oC:/Program Files (x86)/NSIS" "${{ github.workspace }}/envar_plugin.zip"
 
       - name: Configure
-        run: meson setup build -Dbuildtype=release -Ddefault_library=shared -Dbuild_installer=true
+        run: meson setup build -Dbuildtype=release -Ddefault_library=shared -Dbuild_installer=true -Drun_in_ci=true
+        # TODO: enable fatal warnings, once cpp-httplib is patched either by ourselves or by the maintainers: --fatal-meson-warnings
 
       - name: Build installer
         run: |
diff --git a/io.github.openbrickprotocolfoundation.oopetris.yml b/io.github.openbrickprotocolfoundation.oopetris.yml
@@ -12,6 +12,8 @@ modules:
       - -Dbuild_installer=true
       - --libdir=lib
       - -Dtests=true
+      - --fatal-meson-warnings
+      - -Drun_in_ci=true # note we always want the CI checks in the case we built the flatpak
       - --force-fallback-for=fmt # note, the freedesktop sdk has this installed, but it is not copiable into the runtime, so we need to build it ourself, to be able to install it correctly
     builddir: true
     build-options:
diff --git a/meson.options b/meson.options
@@ -25,3 +25,11 @@ option(
     value: false,
     description: 'if you only want to build the libs, enable this',
 )
+
+
+option(
+    'run_in_ci',
+    type: 'boolean',
+    value: false,
+    description: 'enable this, if it is run in CI',
+)
diff --git a/platforms/build-3ds.sh b/platforms/build-3ds.sh
@@ -2,6 +2,44 @@
 
 set -e
 
+## options: "smart, complete_rebuild"
+export COMPILE_TYPE="smart"
+
+export BUILDTYPE="debug"
+
+export RUN_IN_CI="false"
+
+if [ "$#" -eq 0 ]; then
+    # nothing
+    echo "Using compile type '$COMPILE_TYPE'"
+elif [ "$#" -eq 1 ]; then
+    COMPILE_TYPE="$1"
+elif [ "$#" -eq 2 ]; then
+    COMPILE_TYPE="$1"
+    BUILDTYPE="$2"
+elif [ "$#" -eq 3 ]; then
+    COMPILE_TYPE="$1"
+    BUILDTYPE="$2"
+
+    if [ -z "$3" ]; then
+        RUN_IN_CI="false"
+    else
+        RUN_IN_CI="true"
+    fi
+else
+    echo "Too many arguments given, expected 1, 2 or 3"
+    exit 1
+fi
+
+if [ "$COMPILE_TYPE" == "smart" ]; then
+    : # noop
+elif [ "$COMPILE_TYPE" == "complete_rebuild" ]; then
+    : # noop
+else
+    echo "Invalid COMPILE_TYPE, expected: 'smart' or 'complete_rebuild'"
+    exit 1
+fi
+
 export DEVKITPRO="/opt/devkitpro"
 export ARCH_DEVKIT_FOLDER="$DEVKITPRO/devkitARM"
 export COMPILER_BIN="$ARCH_DEVKIT_FOLDER/bin"
@@ -214,33 +252,6 @@ fi
 
 cd ..
 
-## options: "smart, complete_rebuild"
-export COMPILE_TYPE="smart"
-
-export BUILDTYPE="debug"
-
-if [ "$#" -eq 0 ]; then
-    # nothing
-    echo "Using compile type '$COMPILE_TYPE'"
-elif [ "$#" -eq 1 ]; then
-    COMPILE_TYPE="$1"
-elif [ "$#" -eq 2 ]; then
-    COMPILE_TYPE="$1"
-    BUILDTYPE="$2"
-else
-    echo "Too many arguments given, expected 1 or 2"
-    exit 1
-fi
-
-if [ "$COMPILE_TYPE" == "smart" ]; then
-    : # noop
-elif [ "$COMPILE_TYPE" == "complete_rebuild" ]; then
-    : # noop
-else
-    echo "Invalid COMPILE_TYPE, expected: 'smart' or 'complete_rebuild'"
-    exit 1
-fi
-
 if [ ! -d "$ROMFS" ]; then
 
     mkdir -p "$ROMFS"
@@ -260,7 +271,9 @@ if [ "$COMPILE_TYPE" == "complete_rebuild" ] || [ ! -e "$BUILD_DIR" ]; then
         -Dcurl:unittests=disabled \
         -Dcurl:bearer-auth=enabled \
         -Dcurl:brotli=enabled \
-        -Dcurl:libz=enabled
+        -Dcurl:libz=enabled \
+        "-Drun_in_ci=$RUN_IN_CI" \
+        --fatal-meson-warnings
 
 fi
 
diff --git a/platforms/build-android.sh b/platforms/build-android.sh
@@ -51,10 +51,12 @@ export COMPILE_TYPE="smart"
 
 export BUILDTYPE="debug"
 
+export RUN_IN_CI="false"
+
 if [ "$#" -eq 0 ]; then
     # nothing
     echo "Using all architectures"
-elif [ "$#" -eq 1 ] || [ "$#" -eq 2 ] || [ "$#" -eq 3 ]; then
+elif [ "$#" -eq 1 ] || [ "$#" -eq 2 ] || [ "$#" -eq 3 ] || [ "$#" -eq 4 ]; then
     ARCH=$1
 
     FOUND=""
@@ -77,10 +79,20 @@ elif [ "$#" -eq 1 ] || [ "$#" -eq 2 ] || [ "$#" -eq 3 ]; then
     elif [ "$#" -eq 3 ]; then
         COMPILE_TYPE="$2"
         BUILDTYPE="$3"
+    elif [ "$#" -eq 4 ]; then
+        COMPILE_TYPE="$2"
+        BUILDTYPE="$3"
+
+        if [ -z "$4" ]; then
+            RUN_IN_CI="false"
+        else
+            RUN_IN_CI="true"
+        fi
+
     fi
 
 else
-    echo "Too many arguments given, expected 1 ,2 or 3"
+    echo "Too many arguments given, expected 1, 2, 3 or 4"
     exit 1
 fi
 
@@ -270,7 +282,6 @@ for INDEX in "${ARCH_KEYS_INDEX[@]}"; do
             -DBUILD_SHARED_LIBS=OFF \
             -DINSTALL_PKGCONFIG_MODULES=ON
 
-
         cmake --build .
 
         cmake --install .
@@ -436,7 +447,9 @@ EOF
             --cross-file "./platforms/crossbuild-android-$ARM_TARGET_ARCH.ini" \
             "-Dbuildtype=$BUILDTYPE" \
             -Dsdl2:use_hidapi=enabled \
-            -Dclang_libcpp=disabled
+            -Dclang_libcpp=disabled \
+            "-Drun_in_ci=$RUN_IN_CI" \
+            --fatal-meson-warnings
 
     fi
 
diff --git a/platforms/build-switch.sh b/platforms/build-switch.sh
diff --git a/platforms/build-web.sh b/platforms/build-web.sh
diff --git a/platforms/emscripten/sdl2_image_port.diff b/platforms/emscripten/sdl2_image_port.diff
diff --git a/src/lobby/web_client.cpp b/src/lobby/web_client.cpp
diff --git a/tools/dependencies/meson.build b/tools/dependencies/meson.build
diff --git a/tools/options/meson.build b/tools/options/meson.build
