File tree Expand file tree Collapse file tree 2 files changed +12
-13
lines changed Expand file tree Collapse file tree 2 files changed +12
-13
lines changed Original file line number Diff line number Diff line change @@ -1002,7 +1002,7 @@ jobs:
10021002
10031003 windows :
10041004 name : CMake -> exporter proto
1005- runs-on : windows-2019
1005+ runs-on : windows-2022
10061006 steps :
10071007 - name : Harden the runner (Audit all outbound calls)
10081008 uses : step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -1024,7 +1024,7 @@ jobs:
10241024
10251025 windows-build-dll :
10261026 name : CMake -> exporter proto (Build as DLL)
1027- runs-on : windows-2019
1027+ runs-on : windows-2022
10281028 steps :
10291029 - name : Harden the runner (Audit all outbound calls)
10301030 uses : step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -1048,7 +1048,7 @@ jobs:
10481048
10491049 windows_with_async_export :
10501050 name : CMake (With async export) -> exporter proto
1051- runs-on : windows-2019
1051+ runs-on : windows-2022
10521052 steps :
10531053 - name : Harden the runner (Audit all outbound calls)
10541054 uses : step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -1070,7 +1070,7 @@ jobs:
10701070
10711071 windows_bazel :
10721072 name : Bazel Windows
1073- runs-on : windows-2019
1073+ runs-on : windows-2022
10741074 steps :
10751075 - name : Harden the runner (Audit all outbound calls)
10761076 uses : step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -1088,7 +1088,7 @@ jobs:
10881088
10891089 windows_plugin_test :
10901090 name : Plugin -> CMake Windows
1091- runs-on : windows-2019
1091+ runs-on : windows-2022
10921092 steps :
10931093 - name : Harden the runner (Audit all outbound calls)
10941094 uses : step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
Original file line number Diff line number Diff line change @@ -37,14 +37,13 @@ jobs:
3737 - name : Run DLL Tests
3838 run : ./ci/do_ci.ps1 cmake.dll.install.test
3939
40- windows_2019_vcpkg_submodule_min_cmake :
41- name : Windows 2019 vcpkg submodule versions minimum cmake cxx14 (static libs)
42- runs-on : windows-2019
40+ windows_2025_vcpkg_submodule :
41+ name : Windows 2025 vcpkg submodule versions cxx20 (static libs)
42+ runs-on : windows-2025
4343 env :
44- # cmake 3.15 is the minimum for windows builds (See https://github.com/open-telemetry/opentelemetry-cpp/pull/3349#discussion_r2030319430)
45- CMAKE_VERSION : ' 3.15.0'
46- # cxx14 is the default for windows-2019
47- CXX_STANDARD : ' 14'
44+ # Set to the latest version of cmake 3.x
45+ CMAKE_VERSION : ' 3.31.6'
46+ CXX_STANDARD : ' 20'
4847 steps :
4948 - name : Harden the runner (Audit all outbound calls)
5049 uses : step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -373,4 +372,4 @@ jobs:
373372 - name : Run Tests (static libs)
374373 env :
375374 BUILD_SHARED_LIBS : ' OFF'
376- run : ./ci/do_ci.sh cmake.install.test
375+ run : ./ci/do_ci.sh cmake.install.test
You can’t perform that action at this time.
0 commit comments