testing the usage of a matrix to flesh out test variants.

Author: enetheru

.github/workflows/ci-cmake.yml

@@ -35,38 +35,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # ← New dimension — multiplies every platform automatically
+        godot-api:
+          - { version: "master", api-flag: "",      artifact-suffix: "",       test-versions: "" }
+          - { version: "4.6",   api-flag: "4.6",    artifact-suffix: "-godot46", test-versions: "4.6-stable" }
+          - { version: "4.5",   api-flag: "4.5",    artifact-suffix: "-godot45", test-versions: "4.5-stable 4.6-stable" }
+          - { version: "4.4",   api-flag: "4.4",    artifact-suffix: "-godot44", test-versions: "4.4-stable 4.5-stable 4.6-stable" }
+          - { version: "4.3",   api-flag: "4.3",    artifact-suffix: "-godot43", test-versions: "4.3-stable 4.4-stable 4.5-stable 4.6-stable" }
+
+        # ← One entry per platform (no duplication!)
         include:
+          # Tested platforms (will get all 5 API versions)
           - name: 🐧 Linux (GCC, Makefiles)
             os: ubuntu-22.04
             platform: linux
-            config-flags: -DCMAKE_BUILD_TYPE=Release
-            artifact-name: godot-cpp-linux-glibc2.27-x86_64-cmake-release
+            base-config-flags: -DCMAKE_BUILD_TYPE=Release
+            base-artifact-name: godot-cpp-linux-glibc2.27-x86_64-cmake-release
             artifact-path: cmake-build/bin/libgodot-cpp.linux.template_release.x86_64.a
             run-tests: true
             godot-test-arch: "linux.x86_64"
             godot-master-workflow: linux_builds.yml
             godot-master-artifact: linux-editor-mono
 
-          - name: 🐧 Linux (GCC, Makefiles) for Godot 4.6
-            os: ubuntu-22.04
-            platform: linux
-            config-flags:
-              -DCMAKE_BUILD_TYPE=Release
-              -DGODOTCPP_API_VERSION=4.6
-            artifact-name: godot-cpp-linux-glibc2.27-x86_64-cmake-release-godot46
-            artifact-path: cmake-build/bin/libgodot-cpp.linux.template_release.x86_64.a
-            run-tests: true
-            godot-test-versions: "4.6-stable"
-            godot-test-arch: "linux.x86_64"
-            godot-master-workflow: linux_builds.yml
-            godot-master-artifact: linux-editor-mono
-
           - name: 🏁 Windows (x86_64, MSVC)
             os: windows-2022
             platform: windows
             compiler: msvc
             build-flags: --config Release
-            artifact-name: godot-cpp-windows-msvc2022-x86_64-cmake-release
+            base-config-flags: ""   # no extra flags needed
+            base-artifact-name: godot-cpp-windows-msvc2022-x86_64-cmake-release
             artifact-path: cmake-build/bin/libgodot-cpp.windows.template_release.x86_64.lib
             run-tests: true
             godot-test-arch: "win64.exe"
@@ -77,10 +74,8 @@ jobs:
             os: windows-2022
             platform: windows
             compiler: mingw
-            config-flags:
-              -GNinja -DCMAKE_BUILD_TYPE=Release
-              -DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=c++
-            artifact-name: godot-cpp-windows-mingw-x86_64-cmake-release
+            base-config-flags: "-GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=c++"
+            base-artifact-name: godot-cpp-windows-mingw-x86_64-cmake-release
             artifact-path: cmake-build/bin/libgodot-cpp.windows.template_release.x86_64.a
             run-tests: true
             godot-test-arch: "win64.exe"
@@ -90,43 +85,35 @@ jobs:
           - name: 🍎 macOS (universal, Makefiles)
             os: macos-latest
             platform: macos
-            config-flags: -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
-            artifact-name: godot-cpp-macos-universal-cmake-release
+            base-config-flags: -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
+            base-artifact-name: godot-cpp-macos-universal-cmake-release
             artifact-path: cmake-build/bin/libgodot-cpp.macos.template_release.universal.a
             run-tests: true
             godot-test-arch: "macos.universal"
             godot-master-workflow: macos_builds.yml
             godot-master-artifact: macos-editor
 
-          # Non-test platforms
+          # Non-tested platforms (still only built once — master)
           - name: 🤖 Android (arm64, Ninja)
             os: ubuntu-22.04
             platform: android
-            config-flags:
-              -G Ninja -DCMAKE_BUILD_TYPE=Release
-              --toolchain ${ANDROID_HOME}/ndk/28.1.13356709/build/cmake/android.toolchain.cmake
-              -DANDROID_PLATFORM=24 -DANDROID_ABI=arm64-v8a
-            artifact-name: godot-cpp-android-arm64-cmake-release
+            base-config-flags: "-G Ninja -DCMAKE_BUILD_TYPE=Release --toolchain ${ANDROID_HOME}/ndk/28.1.13356709/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=24 -DANDROID_ABI=arm64-v8a"
+            base-artifact-name: godot-cpp-android-arm64-cmake-release
             artifact-path: cmake-build/bin/libgodot-cpp.android.template_release.arm64.a
 
           - name: 🍏 iOS (arm64, XCode)
             os: macos-latest
             platform: ios
-            config-flags:
-              -G Xcode
-              --toolchain cmake/ios.toolchain.cmake
-              -DPLATFORM=OS64
+            base-config-flags: "-G Xcode --toolchain cmake/ios.toolchain.cmake -DPLATFORM=OS64"
             build-flags: --config Release
-            artifact-name: godot-cpp-ios-arm64-cmake-release
+            base-artifact-name: godot-cpp-ios-arm64-cmake-release
             artifact-path: cmake-build/bin/libgodot-cpp.ios.template_release.arm64.a
 
           - name: 🌐 Web (wasm32, Ninja)
             os: ubuntu-22.04
             platform: web
-            config-flags:
-              -G Ninja  -DCMAKE_BUILD_TYPE=Release
-              --toolchain ${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake
-            artifact-name: godot-cpp-web-wasm32-cmake-release
+            base-config-flags: "-G Ninja -DCMAKE_BUILD_TYPE=Release --toolchain ${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+            base-artifact-name: godot-cpp-web-wasm32-cmake-release
             artifact-path: cmake-build/bin/libgodot-cpp.web.template_release.wasm32.a
 
     steps:
@@ -159,7 +146,13 @@ jobs:
         id: configure-debug
         run: |
           echo "DEBUG_BUILD_START=$(date +%s)" >> $GITHUB_ENV
-          cmake --log-level=VERBOSE -S . -B cmake-build ${{ env.config-flags }} ${{ matrix.config-flags }}
+
+          CONFIG_FLAGS="${{ env.config-flags }} ${{ matrix.base-config-flags }}"
+          if [ -n "${{ matrix.godot-api.api-flag }}" ]; then
+            CONFIG_FLAGS="$CONFIG_FLAGS -DGODOTCPP_API_VERSION=${{ matrix.godot-api.api-flag }}"
+          fi
+
+          cmake --log-level=VERBOSE -S . -B cmake-build $CONFIG_FLAGS
 
       - name: Build godot-cpp-test (template_debug)
         id: build-debug
@@ -172,17 +165,25 @@ jobs:
         id: configure-release
         run: |
           echo "RELEASE_BUILD_START=$(date +%s)" >> $GITHUB_ENV
-          cmake --fresh --log-level=VERBOSE -S . -B cmake-build -DGODOTCPP_TARGET=template_release ${{ env.config-flags }} ${{ matrix.config-flags }}
+
+          CONFIG_FLAGS="${{ env.config-flags }} ${{ matrix.base-config-flags }}"
+          if [ -n "${{ matrix.godot-api.api-flag }}" ]; then
+            CONFIG_FLAGS="$CONFIG_FLAGS -DGODOTCPP_API_VERSION=${{ matrix.godot-api.api-flag }}"
+          fi
+
+          cmake --fresh --log-level=VERBOSE -S . -B cmake-build -DGODOTCPP_TARGET=template_release $CONFIG_FLAGS
+
 
       - name: Build godot-cpp-test (template_release)
         id: build-release
         run: |
           cmake --build cmake-build --verbose --target godot-cpp-test ${{ matrix.build-flags }}
           echo "RELEASE_BUILD_END=$(date +%s)" >> $GITHUB_ENV
 
+      # === Download Godot (only for master — cleaner than before) ===
       - name: Download latest Godot artifacts
         uses: dsnopek/action-download-artifact@1322f74e2dac9feed2ee76a32d9ae1ca3b4cf4e9
-        if: matrix.run-tests && env.GODOT_TEST_VERSION == 'master'
+        if: matrix.run-tests && matrix.godot-api.version == 'master'
         with:
           repo: godotengine/godot
           branch: master
@@ -195,17 +196,22 @@ jobs:
           ensure_latest: true
           path: godot-artifacts
 
+      # === Run tests – uses the pre-computed test versions ===
       - name: Run tests
         if: matrix.run-tests
-        run: python -X utf8 run-tests.py --verbose --godot-test-versions "${{ matrix.godot-test-versions }}" --godot-test-arch "${{ matrix.godot-test-arch }}"
+        run: |
+          python -X utf8 run-tests.py --verbose \
+            --godot-test-versions "${{ matrix.godot-api.test-versions }}" \
+            --godot-test-arch "${{ matrix.godot-test-arch }}"
         working-directory: test
         env:
           GITHUB_STEP_SUMMARY: ${{ env.GITHUB_STEP_SUMMARY }}
 
+      # === Upload – uses the dynamic artifact name ===
       - name: Upload artifact
         uses: actions/upload-artifact@v7
         with:
-          name: ${{ matrix.artifact-name }}
+          name: ${{ matrix.base-artifact-name }}${{ matrix.godot-api.artifact-suffix }}
           path: ${{ matrix.artifact-path }}
           if-no-files-found: error