Skip to content

Commit 5287707

Browse files
authored
Merge pull request #629 from achaikou/upgrade_windows_runner
Upgrade windows runners
2 parents 6e54825 + 29df7da commit 5287707

3 files changed

Lines changed: 27 additions & 19 deletions

File tree

.github/workflows/build.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
include:
18-
- os: windows-2019
19-
cmake_generator: "-G \"Visual Studio 16 2019\" -A x64"
18+
- os: windows-2022
19+
cmake_generator: "-G \"Visual Studio 17 2022\" -A x64"
2020
build_type: "Release"
2121
compiler_flags: "-D_CRT_SECURE_NO_WARNINGS /EHsc"
22-
- os: windows-2019
23-
cmake_generator: "-G \"Visual Studio 16 2019\" -A x64"
22+
- os: windows-2022
23+
cmake_generator: "-G \"Visual Studio 17 2022\" -A x64"
2424
build_type: "Debug"
2525
compiler_flags: "-D_CRT_SECURE_NO_WARNINGS /EHsc"
26-
- os: windows-2019
27-
cmake_generator: "-G \"Visual Studio 16 2019\" -A Win32"
26+
- os: windows-2022
27+
cmake_generator: "-G \"Visual Studio 17 2022\" -A Win32"
2828
build_type: "Release"
2929
compiler_flags: "-D_CRT_SECURE_NO_WARNINGS /EHsc"
3030
- os: ubuntu-latest

.github/workflows/large.yaml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
matrix:
1717
include:
1818
# only 64-bit windows
19-
- os: windows-2019
20-
cmake_generator: '-G "Visual Studio 16 2019"'
19+
- os: windows-2022
20+
cmake_generator: '-G "Visual Studio 17 2022"'
2121
- os: ubuntu-latest
2222

2323
steps:
@@ -32,7 +32,7 @@ jobs:
3232
run: |
3333
python -m pip install -r requirements-dev.txt
3434
35-
- name: Configure and Build
35+
- name: Configure
3636
shell: bash
3737
run: |
3838
cmake -S . -B build \
@@ -42,9 +42,17 @@ jobs:
4242
-DCMAKE_BUILD_TYPE=Release \
4343
${{ matrix.cmake_generator }} \
4444
45-
cmake \
46-
--build build \
47-
--config Release \
45+
- name: Build
46+
shell: bash
47+
# scikit-build first checks for toolset v144, which is not available on
48+
# github windows-2022 environment. It is able to build with v143, but
49+
# fails the command anyway. continue-on-error is a workaround for that.
50+
# In case actual error occurs and segyio is not build, tests will fail.
51+
continue-on-error: true
52+
run: |
53+
cmake \
54+
--build build \
55+
--config Release \
4856
4957
- name: Test
5058
shell: bash
@@ -84,8 +92,8 @@ jobs:
8492
# 32-bit one directly. Build works in cbuildwheel as they seem to hack the
8593
# environment to make it look like 32-bit system.
8694
large_win32:
87-
name: Run large tests on windows-2019, 32-bit wheel
88-
runs-on: windows-2019
95+
name: Run large tests on windows-2022, 32-bit wheel
96+
runs-on: windows-2022
8997

9098
steps:
9199
- uses: actions/checkout@v4
@@ -108,7 +116,7 @@ jobs:
108116
env:
109117
CIBW_BUILD_VERBOSITY: 1
110118
CIBW_ENVIRONMENT_WINDOWS: >
111-
CMAKE_GENERATOR="Visual Studio 16 2019"
119+
CMAKE_GENERATOR="Visual Studio 17 2022"
112120
CMAKE_GENERATOR_PLATFORM="Win32"
113121
run: |
114122
python -m cibuildwheel --only cp312-win32 --output-dir ./wheelhouse python/

.github/workflows/wheels.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
include:
20-
- os: windows-2019
21-
cmake_generator: "Visual Studio 16 2019"
20+
- os: windows-2022
21+
cmake_generator: "Visual Studio 17 2022"
2222
cmake_generator_platform: "x64"
2323
arch: AMD64
24-
- os: windows-2019
25-
cmake_generator: "Visual Studio 16 2019"
24+
- os: windows-2022
25+
cmake_generator: "Visual Studio 17 2022"
2626
cmake_generator_platform: "Win32"
2727
arch: x86
2828
- os: ubuntu-latest

0 commit comments

Comments
 (0)