Skip to content

Commit 1181c55

Browse files
authored
Merge pull request #400 from jorisv/topic/windows-latest
Don't use `windows-2019` image since it will be depreciated
2 parents 8dccd7c + 84a2bc9 commit 1181c55

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

.github/workflows/ci-linux-osx-win-conda.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
build_type: [Release, Debug]
22-
name: [ubuntu-latest, macos-latest, windows-2019-clang-cl, windows-latest, macos-14]
22+
name: [ubuntu-latest, macos-latest, windows-latest-clang-cl, windows-latest, macos-13]
2323
cxx_std: [17, 20]
2424
continue_on_error: [false]
2525

@@ -28,13 +28,11 @@ jobs:
2828
os: ubuntu-latest
2929
- name: macos-latest
3030
os: macos-latest
31-
- name: macos-14
32-
os: macos-14
33-
# proxsuite doesn't build with vs2019, so we use clang-cl instead
34-
- name: windows-2019-clang-cl
35-
os: windows-2019
31+
- name: macos-13
32+
os: macos-13
33+
- name: windows-latest-clang-cl
34+
os: windows-latest
3635
compiler: clang-cl
37-
# proxsuite should work with vs2022
3836
- name: windows-latest
3937
os: windows-latest
4038
compiler: cl

.github/workflows/release-osx-win.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
24-
os: [macos-13, macos-14, windows-latest]
24+
os: [macos-13, macos-14, windows-2022]
2525
include:
26-
- os: windows-2019
27-
toolset: ClangCl
28-
- os: windows-latest
26+
- os: windows-2022
2927
toolset: v143
3028

3129
steps:

0 commit comments

Comments
 (0)