Skip to content

Commit da021a8

Browse files
committed
ci: Default jobs to ubuntu-24.04 but allow for overrides
1 parent f638893 commit da021a8

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,18 @@ jobs:
103103
include:
104104
- target: i686-unknown-linux-gnu
105105
docker: true
106-
os: ubuntu-24.04
107106
- target: i686-unknown-linux-gnu
108107
docker: true
109-
os: ubuntu-24.04
110108
artifact-tag: offset-bits64
111109
env:
112110
RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS: 64
113111
- target: i686-unknown-linux-gnu
114112
docker: true
115-
os: ubuntu-24.04
116113
artifact-tag: time-bits64
117114
env:
118115
RUST_LIBC_UNSTABLE_GNU_TIME_BITS: 64
119116
- target: x86_64-unknown-linux-gnu
120117
docker: true
121-
os: ubuntu-24.04
122118
- target: aarch64-apple-darwin
123119
os: macos-15
124120
- target: x86_64-pc-windows-gnu
@@ -135,7 +131,7 @@ jobs:
135131
# ARCH: i686
136132
- target: i686-pc-windows-msvc
137133
os: windows-2025
138-
runs-on: ${{ matrix.os }}
134+
runs-on: ${{ matrix.os || ubuntu-24.04 }}
139135
timeout-minutes: 25
140136
env:
141137
TARGET: ${{ matrix.target }}
@@ -175,7 +171,6 @@ jobs:
175171
test_tier2:
176172
name: Test tier2
177173
needs: [test_tier1, style_check]
178-
runs-on: ubuntu-24.04
179174
strategy:
180175
fail-fast: true
181176
max-parallel: 12
@@ -248,6 +243,7 @@ jobs:
248243
# env:
249244
# RUST_LIBC_UNSTABLE_GNU_TIME_BITS: 64
250245
# artifact-tag: time-bits64
246+
runs-on: ${{ matrix.os || ubuntu-24.04 }}
251247
timeout-minutes: 25
252248
env:
253249
TARGET: ${{ matrix.target }}

0 commit comments

Comments
 (0)