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:
1002
1002
1003
1003
windows :
1004
1004
name : CMake -> exporter proto
1005
- runs-on : windows-2019
1005
+ runs-on : windows-2022
1006
1006
steps :
1007
1007
- name : Harden the runner (Audit all outbound calls)
1008
1008
uses : step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -1024,7 +1024,7 @@ jobs:
1024
1024
1025
1025
windows-build-dll :
1026
1026
name : CMake -> exporter proto (Build as DLL)
1027
- runs-on : windows-2019
1027
+ runs-on : windows-2022
1028
1028
steps :
1029
1029
- name : Harden the runner (Audit all outbound calls)
1030
1030
uses : step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -1048,7 +1048,7 @@ jobs:
1048
1048
1049
1049
windows_with_async_export :
1050
1050
name : CMake (With async export) -> exporter proto
1051
- runs-on : windows-2019
1051
+ runs-on : windows-2022
1052
1052
steps :
1053
1053
- name : Harden the runner (Audit all outbound calls)
1054
1054
uses : step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -1070,7 +1070,7 @@ jobs:
1070
1070
1071
1071
windows_bazel :
1072
1072
name : Bazel Windows
1073
- runs-on : windows-2019
1073
+ runs-on : windows-2022
1074
1074
steps :
1075
1075
- name : Harden the runner (Audit all outbound calls)
1076
1076
uses : step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -1088,7 +1088,7 @@ jobs:
1088
1088
1089
1089
windows_plugin_test :
1090
1090
name : Plugin -> CMake Windows
1091
- runs-on : windows-2019
1091
+ runs-on : windows-2022
1092
1092
steps :
1093
1093
- name : Harden the runner (Audit all outbound calls)
1094
1094
uses : step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
Original file line number Diff line number Diff line change @@ -37,14 +37,13 @@ jobs:
37
37
- name : Run DLL Tests
38
38
run : ./ci/do_ci.ps1 cmake.dll.install.test
39
39
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
43
43
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'
48
47
steps :
49
48
- name : Harden the runner (Audit all outbound calls)
50
49
uses : step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -373,4 +372,4 @@ jobs:
373
372
- name : Run Tests (static libs)
374
373
env :
375
374
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