Skip to content

Commit 53ebda6

Browse files
committed
GitHub Actions: windows-2019 is deprecated
1 parent a471bf5 commit 53ebda6

2 files changed

Lines changed: 19 additions & 35 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
CXX: g++-12
2525
PackageDeps: g++-12
2626
os: ubuntu-22.04
27-
- CC: vs2019
28-
CXX: vs2019
29-
os: windows-2019
27+
- CC: vs2022
28+
CXX: vs2022
29+
os: windows-2022
3030
runs-on: ${{ matrix.os }}
3131
name: ${{ matrix.os }} ${{ matrix.CXX }}
3232
env:

.github/workflows/windows.yml

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,59 +17,43 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
include:
20-
- name: VS2019WChar
21-
vmimage: windows-2019
22-
mpctype: vs2019
20+
- name: VS2022WChar
21+
vmimage: windows-2022
22+
mpctype: vs2022
2323
BuildPlatform: x64
2424
BuildConfiguration: Debug
2525
vcpkgarch: x64-windows
2626
vcpkglibdir: debug/lib
2727
vcpkgpackages: '"openssl", {"name": "xerces-c", "features": ["xmlch-wchar"]}, "zlib"'
2828
OptionalFeatures: uses_wchar=1
29-
- name: VS2019Debug64
30-
vmimage: windows-2019
31-
mpctype: vs2019
32-
BuildPlatform: x64
33-
BuildConfiguration: Debug
34-
vcpkgarch: x64-windows
35-
vcpkglibdir: debug/lib
36-
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
37-
- name: VS2019Release64
38-
vmimage: windows-2019
39-
mpctype: vs2019
40-
BuildPlatform: x64
41-
BuildConfiguration: Release
42-
vcpkgarch: x64-windows
43-
vcpkglibdir: lib
44-
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
45-
- name: VS2019Debug32
46-
vmimage: windows-2019
47-
mpctype: vs2019
29+
- name: VS2022Debug32
30+
vmimage: windows-2022
31+
mpctype: vs2022
4832
BuildPlatform: Win32
4933
BuildConfiguration: Debug
5034
vcpkgarch: x86-windows
5135
vcpkglibdir: debug/lib
5236
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
53-
- name: VS2019Release32
54-
vmimage: windows-2019
55-
mpctype: vs2019
37+
- name: VS2022Release32
38+
vmimage: windows-2022
39+
mpctype: vs2022
5640
BuildPlatform: Win32
5741
BuildConfiguration: Release
5842
vcpkgarch: x86-windows
5943
vcpkglibdir: lib
6044
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
61-
- name: VS2019Debug64Cxx17
62-
vmimage: windows-2019
63-
mpctype: vs2019
45+
- name: VS2022Debug64Cxx17
46+
vmimage: windows-2022
47+
mpctype: vs2022
6448
BuildPlatform: x64
6549
BuildConfiguration: Debug
6650
vcpkgarch: x64-windows
6751
vcpkglibdir: debug/lib
6852
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
6953
OptionalMpcArgs: -value_template LanguageStandard=stdcpp17
70-
- name: VS2019Debug64Cxx20
71-
vmimage: windows-2019
72-
mpctype: vs2019
54+
- name: VS2022Debug64Cxx20
55+
vmimage: windows-2022
56+
mpctype: vs2022
7357
BuildPlatform: x64
7458
BuildConfiguration: Debug
7559
vcpkgarch: x64-windows
@@ -172,7 +156,7 @@ jobs:
172156
- name: Build solution TAO/tests/IDL_Test/IDL_Test.sln
173157
run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/tests/IDL_Test/IDL_Test.sln
174158
mingw:
175-
runs-on: windows-2019
159+
runs-on: windows-2022
176160
strategy:
177161
fail-fast: false
178162
matrix:

0 commit comments

Comments
 (0)