Fix Windows, iOS, tvOS caching

Author: encounter

.github/workflows/build.yml

@@ -96,9 +96,6 @@ jobs:
         #  certificate-passphrase: ${{secrets.MACOS_CERTIFICATE_PASSWORD}}
         #  keychain-password: ${{secrets.MACOS_KEYCHAIN_PASSWORD}}
 
-      - name: Verify CMake version
-        run: cmake --version
-
       - name: Upload artifacts
         uses: actions/upload-artifact@v6
         with:
@@ -123,21 +120,16 @@ jobs:
           brew upgrade --formula
           brew install cmake ninja
           pip3 install --break-system-packages markupsafe
+          rustup target add aarch64-apple-ios
 
       - name: Setup sccache
         uses: mozilla-actions/sccache-action@v0.0.9
 
-      - name: Install Rust iOS target
-        run: rustup target add aarch64-apple-ios
-
-      - name: Verify CMake version
-        run: cmake --version
-
       - name: Configure CMake
-        run: cmake --preset ios-default
+        run: cmake --preset x-ios-ci
 
       - name: Build
-        run: cmake --build --preset ios-default --target install
+        run: cmake --build --preset x-ios-ci --target install
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v6
@@ -163,23 +155,17 @@ jobs:
           brew upgrade --formula
           brew install cmake ninja
           pip3 install --break-system-packages markupsafe
-
-      - name: Setup sccache
-        uses: mozilla-actions/sccache-action@v0.0.9
-
-      - name: Install Rust nightly + tvOS target
-        run: |
           rustup toolchain install nightly
           rustup target add --toolchain nightly aarch64-apple-tvos
 
-      - name: Verify CMake version
-        run: cmake --version
+      - name: Setup sccache
+        uses: mozilla-actions/sccache-action@v0.0.9
 
       - name: Configure CMake
-        run: cmake --preset tvos-default
+        run: cmake --preset x-tvos-ci
 
       - name: Build
-        run: cmake --build --preset tvos-default --target install
+        run: cmake --build --preset x-tvos-ci --target install
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v6
@@ -211,20 +197,21 @@ jobs:
           fetch-depth: 0
           submodules: recursive
 
-      - name: Install dependencies
-        run: choco install ninja
-
-      - name: Setup sccache
-        uses: mozilla-actions/sccache-action@v0.0.9
-
       - name: Enable Visual Studio environment
         uses: ilammy/msvc-dev-cmd@v1
 
+      # msvc-dev-cmd sets VCPKG_ROOT, set it back
       - name: Override VCPKG_ROOT
         run: echo "VCPKG_ROOT=C:\vcpkg" >> $env:GITHUB_ENV
 
-      - name: Install vcpkg packages
-        run: vcpkg install zlib:x64-windows-static bzip2:x64-windows-static zstd:x64-windows-static liblzma:x64-windows-static freetype:x64-windows-static
+      - name: Setup sccache
+        uses: mozilla-actions/sccache-action@v0.0.9
+
+      - name: Install dependencies
+        run: |
+          choco install ninja
+          vcpkg install zlib:x64-windows-static bzip2:x64-windows-static zstd:x64-windows-static \
+            liblzma:x64-windows-static freetype:x64-windows-static
 
       - name: Configure CMake
         run: cmake --preset x-windows-ci-${{matrix.preset}}

CMakePresets.json

@@ -238,6 +238,9 @@
       "displayName": "iOS",
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build/${presetName}",
+      "inherits": [
+        "relwithdebinfo"
+      ],
       "cacheVariables": {
         "CMAKE_TOOLCHAIN_FILE": "ios.toolchain.cmake",
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
@@ -282,6 +285,9 @@
       "displayName": "tvOS",
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build/${presetName}",
+      "inherits": [
+        "relwithdebinfo"
+      ],
       "cacheVariables": {
         "CMAKE_TOOLCHAIN_FILE": "ios.toolchain.cmake",
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
@@ -327,18 +333,13 @@
       "hidden": true,
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/build/${presetName}",
+      "inherits": [
+        "relwithdebinfo"
+      ],
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "CMAKE_INSTALL_PREFIX": "${sourceDir}/build/install",
         "CMAKE_TOOLCHAIN_FILE": "$env{ANDROID_HOME}/ndk/$env{ANDROID_NDK_VERSION}/build/cmake/android.toolchain.cmake",
         "ANDROID_PLATFORM": "android-24"
-      },
-      "vendor": {
-        "microsoft.com/VisualStudioSettings/CMake/1.0": {
-          "hostOS": [
-            "Linux"
-          ]
-        }
       }
     },
     {
@@ -396,6 +397,26 @@
         "CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
       }
     },
+    {
+      "name": "x-ios-ci",
+      "inherits": [
+        "ios-default"
+      ],
+      "cacheVariables": {
+        "CMAKE_C_COMPILER_LAUNCHER": "sccache",
+        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
+      }
+    },
+    {
+      "name": "x-tvos-ci",
+      "inherits": [
+        "tvos-default"
+      ],
+      "cacheVariables": {
+        "CMAKE_C_COMPILER_LAUNCHER": "sccache",
+        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
+      }
+    },
     {
       "name": "x-windows-ci",
       "hidden": true,
@@ -405,7 +426,9 @@
       "binaryDir": "$env{BUILD_DIR}",
       "cacheVariables": {
         "CMAKE_C_COMPILER_LAUNCHER": "sccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
+        "CMAKE_CXX_COMPILER_LAUNCHER": "sccache",
+        "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "Embedded",
+        "CMAKE_POLICY_CMP0141": "NEW"
       }
     },
     {
@@ -539,8 +562,7 @@
       "displayName": "(Internal) Linux CI GCC",
       "targets": [
         "install"
-      ],
-      "verbose": true
+      ]
     },
     {
       "name": "x-linux-ci-clang",
@@ -549,8 +571,7 @@
       "displayName": "(Internal) Linux CI Clang",
       "targets": [
         "install"
-      ],
-      "verbose": true
+      ]
     },
     {
       "name": "x-macos-ci",
@@ -559,8 +580,25 @@
       "displayName": "(Internal) macOS CI",
       "targets": [
         "install"
-      ],
-      "verbose": true
+      ]
+    },
+    {
+      "name": "x-ios-ci",
+      "configurePreset": "x-ios-ci",
+      "description": "(Internal) iOS CI",
+      "displayName": "(Internal) iOS CI",
+      "targets": [
+        "install"
+      ]
+    },
+    {
+      "name": "x-tvos-ci",
+      "configurePreset": "x-tvos-ci",
+      "description": "(Internal) tvOS CI",
+      "displayName": "(Internal) tvOS CI",
+      "targets": [
+        "install"
+      ]
     },
     {
       "name": "x-windows-ci-msvc",
@@ -569,8 +607,7 @@
       "displayName": "(Internal) Windows CI MSVC",
       "targets": [
         "install"
-      ],
-      "verbose": true
+      ]
     },
     {
       "name": "x-windows-ci-clang",
@@ -579,8 +616,7 @@
       "displayName": "(Internal) Windows CI Clang",
       "targets": [
         "install"
-      ],
-      "verbose": true
+      ]
     }
   ]
 }