Skip to content

Commit 408a2ed

Browse files
committed
ci: Upgrade to the macos-15 and windows-2025 runners
1 parent 17299d3 commit 408a2ed

File tree

2 files changed

+6
-25
lines changed

2 files changed

+6
-25
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
name: Clippy on ${{ matrix.os }}
3939
strategy:
4040
matrix:
41-
os: [ubuntu-24.04, macos-14, windows-2022]
41+
os: [ubuntu-24.04, macos-15, windows-2025]
4242
runs-on: ${{ matrix.os }}
4343
timeout-minutes: 10
4444
steps:
@@ -56,7 +56,7 @@ jobs:
5656
strategy:
5757
matrix:
5858
toolchain: [stable, nightly, 1.63.0]
59-
os: [ubuntu-24.04, macos-14, windows-2022]
59+
os: [ubuntu-24.04, macos-15, windows-2025]
6060
include:
6161
- toolchain: beta
6262
os: ubuntu-24.04
@@ -120,21 +120,21 @@ jobs:
120120
docker: true
121121
os: ubuntu-24.04
122122
- target: aarch64-apple-darwin
123-
os: macos-14
123+
os: macos-15
124124
- target: x86_64-pc-windows-gnu
125-
os: windows-2022
125+
os: windows-2025
126126
env:
127127
ARCH_BITS: 64
128128
ARCH: x86_64
129129
- target: x86_64-pc-windows-msvc
130-
os: windows-2022
130+
os: windows-2025
131131
# FIXME: It currently causes segfaults.
132132
#- target: i686-pc-windows-gnu
133133
# env:
134134
# ARCH_BITS: 32
135135
# ARCH: i686
136136
- target: i686-pc-windows-msvc
137-
os: windows-2022
137+
os: windows-2025
138138
runs-on: ${{ matrix.os }}
139139
timeout-minutes: 25
140140
env:

ci/create-artifacts.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,4 @@ def main():
4242

4343

4444
if __name__ == "__main__":
45-
# FIXME(ci): remove after the bump to windoes-2025 GHA images
46-
# Python <= 3.9 does not support the very helpful `root_dir` argument,
47-
# and that is the version used by the Windows GHA images. Rather than
48-
# using setup-python or doing something in the CI script, just find
49-
# the newer version and relaunch if this happens to be run with an old
50-
# version.
51-
try:
52-
glob("", root_dir="")
53-
except TypeError:
54-
if os.environ.get("CI") is None:
55-
sys.exit(1)
56-
57-
# Find the next 3.1x Python version
58-
dirs = sorted(list(Path(r"C:\hostedtoolcache\windows\Python").iterdir()))
59-
usepy = next(x for x in dirs if r"\3.1" in str(x))
60-
py = usepy.joinpath(r"x64\python.exe")
61-
print(f"relaunching with {py}")
62-
os.execvp(py, [__file__] + sys.argv)
63-
6445
main()

0 commit comments

Comments
 (0)