Skip to content

Commit

Permalink
use vs 2022
Browse files Browse the repository at this point in the history
  • Loading branch information
mryzhov committed Jan 17, 2025
1 parent 93b2567 commit 339e0df
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/job_build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
BUILD_DIR: "${{ github.workspace }}\\openvino_build"
ARTIFACTS_SHARE: "C:\\mount\\build-artifacts"
MANIFEST_PATH: "${{ github.workspace }}\\manifest.yml"
PRODUCT_TYPE: 'public_windows_vs2019_${{ inputs.build-type }}'
PRODUCT_TYPE: 'public_windows_vs2022_${{ inputs.build-type }}'
steps:
- name: Clone OpenVINO
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down Expand Up @@ -155,10 +155,10 @@ jobs:
restore-keys: |
${{ runner.os }}-${{ runner.arch }}-ccache
- name: Configure Developer Command Prompt for Microsoft Visual C++ (2019)
- name: Configure Developer Command Prompt for Microsoft Visual C++
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.29
toolset: 14.40 # v2022

- name: Set SSL_CERT_FILE for model downloading for unit tests
run: echo SSL_CERT_FILE=$(python3 -m certifi) >> $env:GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/job_samples_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ jobs:
version: '3.11'
should-setup-pip-paths: 'false'

- name: Configure Developer Command Prompt for Microsoft Visual C++ (2022)
- name: Configure Developer Command Prompt for Microsoft Visual C++
if: runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.40
toolset: 14.40 # v2022

- name: Build cpp samples
run: $INSTALL_DIR/samples/cpp/build_samples.sh -i $INSTALL_DIR -b $BUILD_DIR/cpp_samples
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_conditional_compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ jobs:
- name: Configure Developer Command Prompt for Microsoft Visual C++
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
toolset: 14.40
toolset: 14.40 # v2022

- name: Set SSL_CERT_FILE for model downloading for unit tests
run: echo SSL_CERT_FILE=$(python3 -m certifi) >> $env:GITHUB_ENV
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows_vs2019_debug.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Windows (VS 2019, Python 3.11, Debug)
name: Windows (VS 2022, Python 3.11, Debug)
on:
workflow_dispatch:
merge_group:
Expand All @@ -9,7 +9,7 @@ on:
- 'releases/**'
concurrency:
# github.ref is not unique in post-commit
group: ${{ github.event_name == 'push' && github.run_id || github.ref }}-windows-vs2019-debug
group: ${{ github.event_name == 'push' && github.run_id || github.ref }}-windows-vs2022-debug
cancel-in-progress: true

permissions: read-all
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
with:
runner: 'aks-win-4-cores-8gb'
affected-components: ${{ needs.smart_ci.outputs.affected_components }}
os: 'windows_2019'
os: 'windows_2022'
build-type: 'Debug'
timeout-minutes: 60

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows_vs2019_release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Windows (VS 2019, Python 3.11, Release)
name: Windows (VS 2022, Python 3.11, Release)
on:
workflow_dispatch:
pull_request:
Expand Down Expand Up @@ -515,7 +515,7 @@ jobs:
with:
runner: 'aks-win-4-cores-8gb'
affected-components: ${{ needs.smart_ci.outputs.affected_components }}
os: 'windows_2019'
os: 'windows_2022'
build-type: 'Release'
timeout-minutes: 50

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/workflows_to_track.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ name: Linux Static CC (Ubuntu 22.04, Python 3.11, Clang)
name: GitHub Actions Workflows Scans
==> ./check_pr_commits.yml <==
name: PR Commits
==> ./windows_vs2019_debug.yml <==
name: Windows (VS 2019, Python 3.11, Debug)
==> ./windows_vs2022_debug.yml <==
name: Windows (VS 2022, Python 3.11, Debug)
==> ./files_size.yml <==
name: Files Size
==> ./cleanup_caches.yml <==
Expand Down Expand Up @@ -69,7 +69,7 @@ name: Webassembly
name: Linux (Ubuntu 24.04, Python 3.12)
==> ./assign_issue.yml <==
name: Take Issue
==> ./windows_vs2019_release.yml <==
name: Windows (VS 2019, Python 3.11, Release)
==> ./windows_vs2022_release.yml <==
name: Windows (VS 2022, Python 3.11, Release)
==> ./coverity.yml <==
name: Coverity (Ubuntu 20.04, Python 3.11)

0 comments on commit 339e0df

Please sign in to comment.