File tree Expand file tree Collapse file tree 2 files changed +6
-25
lines changed Expand file tree Collapse file tree 2 files changed +6
-25
lines changed Original file line number Diff line number Diff line change 38
38
name : Clippy on ${{ matrix.os }}
39
39
strategy :
40
40
matrix :
41
- os : [ubuntu-24.04, macos-14 , windows-2022 ]
41
+ os : [ubuntu-24.04, macos-15 , windows-2025 ]
42
42
runs-on : ${{ matrix.os }}
43
43
timeout-minutes : 10
44
44
steps :
56
56
strategy :
57
57
matrix :
58
58
toolchain : [stable, nightly, 1.63.0]
59
- os : [ubuntu-24.04, macos-14 , windows-2022 ]
59
+ os : [ubuntu-24.04, macos-15 , windows-2025 ]
60
60
include :
61
61
- toolchain : beta
62
62
os : ubuntu-24.04
@@ -120,21 +120,21 @@ jobs:
120
120
docker : true
121
121
os : ubuntu-24.04
122
122
- target : aarch64-apple-darwin
123
- os : macos-14
123
+ os : macos-15
124
124
- target : x86_64-pc-windows-gnu
125
- os : windows-2022
125
+ os : windows-2025
126
126
env :
127
127
ARCH_BITS : 64
128
128
ARCH : x86_64
129
129
- target : x86_64-pc-windows-msvc
130
- os : windows-2022
130
+ os : windows-2025
131
131
# FIXME: It currently causes segfaults.
132
132
# - target: i686-pc-windows-gnu
133
133
# env:
134
134
# ARCH_BITS: 32
135
135
# ARCH: i686
136
136
- target : i686-pc-windows-msvc
137
- os : windows-2022
137
+ os : windows-2025
138
138
runs-on : ${{ matrix.os }}
139
139
timeout-minutes : 25
140
140
env :
Original file line number Diff line number Diff line change @@ -42,23 +42,4 @@ def main():
42
42
43
43
44
44
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
-
64
45
main ()
You can’t perform that action at this time.
0 commit comments