[GHA] Use explicitly 2019 / 2022 toolsets

ilya-lavrenov · Sep 17, 2024 · a0a6e6a · a0a6e6a
1 parent 3349870
commit a0a6e6a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/job_build_windows.yml b/.github/workflows/job_build_windows.yml
@@ -156,10 +156,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ runner.arch }}-ccache
 
-      - name: Configure Developer Command Prompt for Microsoft Visual C++
+      - name: Configure Developer Command Prompt for Microsoft Visual C++ (2019)
         uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
         with:
-          toolset: 14.40
+          toolset: 14.29
+          vsversion: 2019
 
       - name: Set SSL_CERT_FILE for model downloading for unit tests
         run: echo SSL_CERT_FILE=$(python3 -m certifi) >> $env:GITHUB_ENV

diff --git a/.github/workflows/job_samples_tests.yml b/.github/workflows/job_samples_tests.yml
@@ -83,7 +83,14 @@ jobs:
           version: '3.11'
           should-setup-pip-paths: 'false'
 
-      - name: Build cpp samples - GCC
+      - name: Configure Developer Command Prompt for Microsoft Visual C++ (2022)
+        if: runner.os == 'Windows'
+        uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+        with:
+          toolset: 14.40
+          vsversion: 2022
+
+      - name: Build cpp samples
         run: $INSTALL_DIR/samples/cpp/build_samples.sh -i $INSTALL_DIR -b $BUILD_DIR/cpp_samples
         env:
           CMAKE_COMPILE_WARNING_AS_ERROR: 'ON'

diff --git a/.github/workflows/windows_conditional_compilation.yml b/.github/workflows/windows_conditional_compilation.yml
@@ -155,6 +155,7 @@ jobs:
         uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
         with:
           toolset: 14.40
+          vsversion: 2022
 
       - name: Set SSL_CERT_FILE for model downloading for unit tests
         run: echo SSL_CERT_FILE=$(python3 -m certifi) >> $env:GITHUB_ENV