Skip to content

Commit 65e2a45

Browse files
committed
ci: use *-latest OS, upgrading from windows-2022 to windows-2025
vulkan driver discovery behaviour has changed: jakoch/install-vulkan-sdk-action#547 (comment)
1 parent e3bd6d5 commit 65e2a45

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
os: [ ubuntu-24.04, windows-2022, macOS-latest ]
24+
os: [ ubuntu-latest, windows-latest, macOS-latest ]
2525
runs-on: ${{ matrix.os }}
2626
env:
2727
RUSTUP_UNPACK_RAM: "26214400"
@@ -81,7 +81,7 @@ jobs:
8181
name: Android
8282
strategy:
8383
matrix:
84-
os: [ ubuntu-24.04 ]
84+
os: [ ubuntu-latest ]
8585
target: [ aarch64-linux-android ]
8686
runs-on: ${{ matrix.os }}
8787
env:
@@ -129,7 +129,7 @@ jobs:
129129
strategy:
130130
fail-fast: false
131131
matrix:
132-
os: [ ubuntu-24.04, windows-2022, macOS-latest ]
132+
os: [ ubuntu-latest, windows-latest, macOS-latest ]
133133
runs-on: ${{ matrix.os }}
134134
steps:
135135
- uses: actions/checkout@v4
@@ -152,7 +152,7 @@ jobs:
152152
strategy:
153153
fail-fast: false
154154
matrix:
155-
os: [ ubuntu-24.04, windows-2022, macOS-latest ]
155+
os: [ ubuntu-latest, windows-latest, macOS-latest ]
156156
runs-on: ${{ matrix.os }}
157157
steps:
158158
- uses: actions/checkout@v4
@@ -193,7 +193,7 @@ jobs:
193193
# This allows us to have a single job we can branch protect on, rather than needing
194194
# to update the branch protection rules when the test matrix changes
195195
test_success:
196-
runs-on: ubuntu-24.04
196+
runs-on: ubuntu-latest
197197
needs: [test, compiletest, difftest, android, lint, cargo-deny]
198198
# Hack for buggy GitHub Actions behavior with skipped checks: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
199199
if: ${{ always() }}
@@ -210,7 +210,7 @@ jobs:
210210
211211
lint:
212212
name: Lint
213-
runs-on: ubuntu-24.04
213+
runs-on: ubuntu-latest
214214
steps:
215215
# Note that we are explicitly NOT checking out submodules, to validate
216216
# that we haven't accidentally enabled spirv-tools native compilation
@@ -252,7 +252,7 @@ jobs:
252252
run: .github/workflows/lint.sh
253253

254254
cargo-deny:
255-
runs-on: ubuntu-24.04
255+
runs-on: ubuntu-latest
256256
steps:
257257
- uses: actions/checkout@v4
258258
- uses: EmbarkStudios/cargo-deny-action@v2

0 commit comments

Comments
 (0)