Skip to content

Commit fbee0da

Browse files
biojppmbiojppm
committed
ci: deprecation of windows-2019 runner image
1 parent 27f61d0 commit fbee0da

8 files changed

Lines changed: 47 additions & 103 deletions

File tree

‎.github/workflows-in/install.ys‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ jobs:
5959
:vars '-Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/lib/cmake/ryml
6060
-DRYML_TEST_INSTALL_PACKAGE_MODE=ON',
6161
:commonvars nil}
62-
{:name "$fp/win", :sdir t-t-i, :os 'windows-2019', :cxx 'vs2019',
63-
:gen "-G 'Visual Studio 16 2019' -A x64",
62+
{:name "$fp/win", :sdir t-t-i, :os 'windows-2022', :cxx 'vs2022',
63+
:gen "-G 'Visual Studio 17 2022' -A x64",
6464
:tgt 'ALL_BUILD', :bt 'Release',
6565
:vars '-Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/cmake
6666
-DRYML_TEST_INSTALL_PACKAGE_MODE=ON',
6767
:commonvars nil}
68-
{:name "$fp/win", :sdir t-t-i, :os 'windows-2019', :cxx 'vs2019',
69-
:gen "-G 'Visual Studio 16 2019' -A x64",
68+
{:name "$fp/win", :sdir t-t-i, :os 'windows-2022', :cxx 'vs2022',
69+
:gen "-G 'Visual Studio 17 2022' -A x64",
7070
:tgt 'ALL_BUILD', :bt 'Debug',
7171
:vars '-Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/cmake
7272
-DRYML_TEST_INSTALL_PACKAGE_MODE=ON',
@@ -104,14 +104,14 @@ jobs:
104104
:vars '-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR
105105
-DRYML_TEST_INSTALL_PACKAGE_MODE=OFF',
106106
:commonvars nil}
107-
{:name "$fl/win", :sdir t-t-i, :os 'windows-2019', :cxx 'vs2019',
108-
:gen "-G 'Visual Studio 16 2019' -A x64",
107+
{:name "$fl/win", :sdir t-t-i, :os 'windows-2022', :cxx 'vs2022',
108+
:gen "-G 'Visual Studio 17 2022' -A x64",
109109
:tgt 'ALL_BUILD', :bt 'Release',
110110
:vars '-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR
111111
-DRYML_TEST_INSTALL_PACKAGE_MODE=OFF',
112112
:commonvars nil}
113-
{:name "$fl/win", :sdir t-t-i, :os 'windows-2019', :cxx 'vs2019',
114-
:gen "-G 'Visual Studio 16 2019' -A x64",
113+
{:name "$fl/win", :sdir t-t-i, :os 'windows-2022', :cxx 'vs2022',
114+
:gen "-G 'Visual Studio 17 2022' -A x64",
115115
:tgt 'ALL_BUILD', :bt 'Debug',
116116
:vars '-DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR
117117
-DRYML_TEST_INSTALL_PACKAGE_MODE=OFF',
@@ -135,11 +135,11 @@ jobs:
135135
{:name "$sh/macos", :sdir t-t-s, :os 'macos-13', :cxx 'xcode',
136136
:gen '-G Xcode -DCMAKE_OSX_ARCHITECTURES=x86_64',
137137
:tgt 'ALL_BUILD', :bt 'Debug', :vars nil, :commonvars nil}
138-
{:name "$sh/win", :sdir t-t-s, :os 'windows-2019', :cxx 'vs2019',
139-
:gen "-G 'Visual Studio 16 2019' -A x64",
138+
{:name "$sh/win", :sdir t-t-s, :os 'windows-2022', :cxx 'vs2022',
139+
:gen "-G 'Visual Studio 17 2022' -A x64",
140140
:tgt 'ALL_BUILD', :bt 'Release', :vars nil, :commonvars nil}
141-
{:name "$sh/win", :sdir t-t-s, :os 'windows-2019', :cxx 'vs2019',
142-
:gen "-G 'Visual Studio 16 2019' -A x64",
141+
{:name "$sh/win", :sdir t-t-s, :os 'windows-2022', :cxx 'vs2022',
142+
:gen "-G 'Visual Studio 17 2022' -A x64",
143143
:tgt 'ALL_BUILD', :bt 'Debug', :vars nil, :commonvars nil}]
144144

145145
env:

‎.github/workflows-in/release.ys‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ python-wheel-matrix =::
6161
- ! pywhl('3.7' 37 'i686' 'manylinux_i686' 'ubuntu-22.04')
6262
- ! pywhl('3.7' 37 'x86_64' 'macosx_x86_64' 'macos-13' )
6363
# pyv arch platform os
64-
- ! pywhl('3.6' 36 'x86_64' 'manylinux_x86_64' 'ubuntu-20.04') # setup-python 3.6 requires ubuntu 20.04
65-
- ! pywhl('3.6' 36 'i686' 'manylinux_i686' 'ubuntu-20.04') # setup-python 3.6 requires ubuntu 20.04
64+
#- ! pywhl('3.6' 36 'x86_64' 'manylinux_x86_64' 'ubuntu-20.04') # setup-python 3.6 requires ubuntu 20.04
65+
#- ! pywhl('3.6' 36 'i686' 'manylinux_i686' 'ubuntu-20.04') # setup-python 3.6 requires ubuntu 20.04
6666
- ! pywhl('3.6' 36 'x86_64' 'macosx_x86_64' 'macos-13' )
6767

6868

@@ -278,10 +278,10 @@ jobs:
278278
# sfxg: unix64.deb,
279279
# sfxp: ubuntu-18.04.deb,
280280
# gen: DEB, mime: vnd.debian.binary-package, os: ubuntu-18.04}
281-
- {name: Windows VS2019 zip,
281+
- {name: Windows VS2022 zip,
282282
sfxg: win64.zip,
283-
sfxp: windows-vs2019.zip,
284-
gen: ZIP, mime: zip, os: windows-2019, cxx: vs2019}
283+
sfxp: windows-vs2022.zip,
284+
gen: ZIP, mime: zip, os: windows-2022, cxx: vs2022}
285285
- {name: MacOSX sh,
286286
sfxg: apple64.sh,
287287
sfxp: macosx-xcode.sh,

‎.github/workflows-in/samples.ys‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
include:
1414
- {bt: Debug , os: ubuntu-24.04}
1515
- {bt: Release, os: ubuntu-24.04}
16-
- {bt: Debug , os: windows-2019}
17-
- {bt: Release, os: windows-2019}
16+
- {bt: Debug , os: windows-2022}
17+
- {bt: Release, os: windows-2022}
1818
- {bt: Debug , os: macos-latest}
1919
- {bt: Release, os: macos-latest}
2020
env: !:merge*

‎.github/workflows-in/windows.ys‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ items =::
99
fail-fast: false
1010
matrix:
1111
include:
12-
- {std: 11, name: vs2019/64, os: 2019, gen: Visual Studio 16 2019, arch: x64}
13-
- {std: 11, name: vs2019/32, os: 2019, gen: Visual Studio 16 2019, arch: Win32}
14-
- {std: 17, name: vs2019/64, os: 2019, gen: Visual Studio 16 2019, arch: x64}
15-
- {std: 17, name: vs2019/32, os: 2019, gen: Visual Studio 16 2019, arch: Win32}
12+
#- {std: 11, name: vs2019/64, os: 2019, gen: Visual Studio 16 2019, arch: x64}
13+
#- {std: 11, name: vs2019/32, os: 2019, gen: Visual Studio 16 2019, arch: Win32}
14+
#- {std: 17, name: vs2019/64, os: 2019, gen: Visual Studio 16 2019, arch: x64}
15+
#- {std: 17, name: vs2019/32, os: 2019, gen: Visual Studio 16 2019, arch: Win32}
1616
- {std: 11, name: vs2022/64, os: 2022, gen: Visual Studio 17 2022, arch: x64}
1717
- {std: 11, name: vs2022/32, os: 2022, gen: Visual Studio 17 2022, arch: Win32}
1818
- {std: 17, name: vs2022/64, os: 2022, gen: Visual Studio 17 2022, arch: x64}

‎.github/workflows/install.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,18 @@ jobs:
8686
commonvars: null
8787
- name: find_package/win
8888
sdir: test/test_install
89-
os: windows-2019
90-
cxx: vs2019
91-
gen: -G 'Visual Studio 16 2019' -A x64
89+
os: windows-2022
90+
cxx: vs2022
91+
gen: -G 'Visual Studio 17 2022' -A x64
9292
tgt: ALL_BUILD
9393
bt: Release
9494
vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/cmake -DRYML_TEST_INSTALL_PACKAGE_MODE=ON
9595
commonvars: null
9696
- name: find_package/win
9797
sdir: test/test_install
98-
os: windows-2019
99-
cxx: vs2019
100-
gen: -G 'Visual Studio 16 2019' -A x64
98+
os: windows-2022
99+
cxx: vs2022
100+
gen: -G 'Visual Studio 17 2022' -A x64
101101
tgt: ALL_BUILD
102102
bt: Debug
103103
vars: -Dryml_DIR=$GITHUB_WORKSPACE/$PDIR/cmake -DRYML_TEST_INSTALL_PACKAGE_MODE=ON
@@ -158,18 +158,18 @@ jobs:
158158
commonvars: null
159159
- name: find_library/win
160160
sdir: test/test_install
161-
os: windows-2019
162-
cxx: vs2019
163-
gen: -G 'Visual Studio 16 2019' -A x64
161+
os: windows-2022
162+
cxx: vs2022
163+
gen: -G 'Visual Studio 17 2022' -A x64
164164
tgt: ALL_BUILD
165165
bt: Release
166166
vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF
167167
commonvars: null
168168
- name: find_library/win
169169
sdir: test/test_install
170-
os: windows-2019
171-
cxx: vs2019
172-
gen: -G 'Visual Studio 16 2019' -A x64
170+
os: windows-2022
171+
cxx: vs2022
172+
gen: -G 'Visual Studio 17 2022' -A x64
173173
tgt: ALL_BUILD
174174
bt: Debug
175175
vars: -DCMAKE_PREFIX_PATH=$GITHUB_WORKSPACE/$PDIR -DRYML_TEST_INSTALL_PACKAGE_MODE=OFF
@@ -230,18 +230,18 @@ jobs:
230230
commonvars: null
231231
- name: singleheader/win
232232
sdir: test/test_singleheader
233-
os: windows-2019
234-
cxx: vs2019
235-
gen: -G 'Visual Studio 16 2019' -A x64
233+
os: windows-2022
234+
cxx: vs2022
235+
gen: -G 'Visual Studio 17 2022' -A x64
236236
tgt: ALL_BUILD
237237
bt: Release
238238
vars: null
239239
commonvars: null
240240
- name: singleheader/win
241241
sdir: test/test_singleheader
242-
os: windows-2019
243-
cxx: vs2019
244-
gen: -G 'Visual Studio 16 2019' -A x64
242+
os: windows-2022
243+
cxx: vs2022
244+
gen: -G 'Visual Studio 17 2022' -A x64
245245
tgt: ALL_BUILD
246246
bt: Debug
247247
vars: null

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,13 @@ jobs:
178178
gen: DEB
179179
mime: vnd.debian.binary-package
180180
os: ubuntu-22.04
181-
- name: Windows VS2019 zip
181+
- name: Windows VS2022 zip
182182
sfxg: win64.zip
183-
sfxp: windows-vs2019.zip
183+
sfxp: windows-vs2022.zip
184184
gen: ZIP
185185
mime: zip
186-
os: windows-2019
187-
cxx: vs2019
186+
os: windows-2022
187+
cxx: vs2022
188188
- name: MacOSX sh
189189
sfxg: apple64.sh
190190
sfxp: macosx-xcode.sh
@@ -587,22 +587,6 @@ jobs:
587587
cibw_arch: x86_64
588588
cibw_platform: macosx_x86_64
589589
vsenvarch: ''
590-
- name: python/3.6/manylinux_x86_64
591-
sfx: python3.6-manylinux_x86_64
592-
os: ubuntu-20.04
593-
pythonv: '3.6'
594-
cibw_pyv: 36
595-
cibw_arch: x86_64
596-
cibw_platform: manylinux_x86_64
597-
vsenvarch: ''
598-
- name: python/3.6/manylinux_i686
599-
sfx: python3.6-manylinux_i686
600-
os: ubuntu-20.04
601-
pythonv: '3.6'
602-
cibw_pyv: 36
603-
cibw_arch: i686
604-
cibw_platform: manylinux_i686
605-
vsenvarch: ''
606590
- name: python/3.6/macosx_x86_64
607591
sfx: python3.6-macosx_x86_64
608592
os: macos-13

‎.github/workflows/samples.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
- bt: Release
3333
os: ubuntu-24.04
3434
- bt: Debug
35-
os: windows-2019
35+
os: windows-2022
3636
- bt: Release
37-
os: windows-2019
37+
os: windows-2022
3838
- bt: Debug
3939
os: macos-latest
4040
- bt: Release

‎.github/workflows/windows.yml‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,6 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- std: 11
32-
name: vs2019/64
33-
os: 2019
34-
gen: Visual Studio 16 2019
35-
arch: x64
36-
- std: 11
37-
name: vs2019/32
38-
os: 2019
39-
gen: Visual Studio 16 2019
40-
arch: Win32
41-
- std: 17
42-
name: vs2019/64
43-
os: 2019
44-
gen: Visual Studio 16 2019
45-
arch: x64
46-
- std: 17
47-
name: vs2019/32
48-
os: 2019
49-
gen: Visual Studio 16 2019
50-
arch: Win32
5131
- std: 11
5232
name: vs2022/64
5333
os: 2022
@@ -168,26 +148,6 @@ jobs:
168148
fail-fast: false
169149
matrix:
170150
include:
171-
- std: 11
172-
name: vs2019/64
173-
os: 2019
174-
gen: Visual Studio 16 2019
175-
arch: x64
176-
- std: 11
177-
name: vs2019/32
178-
os: 2019
179-
gen: Visual Studio 16 2019
180-
arch: Win32
181-
- std: 17
182-
name: vs2019/64
183-
os: 2019
184-
gen: Visual Studio 16 2019
185-
arch: x64
186-
- std: 17
187-
name: vs2019/32
188-
os: 2019
189-
gen: Visual Studio 16 2019
190-
arch: Win32
191151
- std: 11
192152
name: vs2022/64
193153
os: 2022

0 commit comments

Comments
 (0)