Browse Source

[CI][windows] use msvc v142 toolset for Intel builds

Andrey Filipenkov 1 week ago
parent
commit
26cc3afed5
3 changed files with 5 additions and 2 deletions
  1. 3 0
      .github/workflows/github.yml
  2. 1 1
      CI/install_conan_dependencies.sh
  3. 1 1
      dependencies

+ 3 - 0
.github/workflows/github.yml

@@ -56,6 +56,7 @@ jobs:
 
           - platform: msvc-x64
             arch: x64
+            toolset: '14.29'
             os: windows-2025
             pack: 1
             upload: 0
@@ -70,6 +71,7 @@ jobs:
 
           - platform: msvc-x86
             arch: x86
+            toolset: '14.29'
             os: windows-2025
             pack: 1
             upload: 0
@@ -178,6 +180,7 @@ jobs:
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: ${{ matrix.arch }}
+        toolset: ${{ matrix.toolset }}
 
     # ensure the cache for each PR is separate so they don't interfere with each other
     # fall back to cache of the vcmi/vcmi repo if no PR-specific cache is found

+ 1 - 1
CI/install_conan_dependencies.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-RELEASE_TAG="2025-08-24"
+RELEASE_TAG="2025-10-12"
 FILENAME="$1.tgz"
 DOWNLOAD_URL="https://github.com/vcmi/vcmi-dependencies/releases/download/$RELEASE_TAG/$FILENAME"
 

+ 1 - 1
dependencies

@@ -1 +1 @@
-Subproject commit b6f03bd541f19ad441ffb930a2cbd000222a50bf
+Subproject commit c0e4b540e926c732621a0938e31cf3c181247c6c