Skip to content

Commit 3afc93c

Browse files
EliahKaganclaude
andcommitted
Preview upcoming Windows VS 2026 + macOS 26 runner images
GitHub is migrating three runner labels in the next ~4 weeks: - `windows-latest` and `windows-2025` get Visual Studio 2026 between June 8-15, 2026, replacing the VS 2022 toolchain. - `macos-latest` starts pointing to macOS 26 over a 30-day rollout beginning June 15, 2026. To shake out incompatibilities ahead of the brownout, retarget every affected `runs-on` value across `ci`, `codeql`, and `release` workflows to the temporary `windows-2025-vs2026` preview label and the `macos-26` label (GA since February 2026). The two `matrix.os == 'windows-latest'` archive-packaging conditionals in `release.yml` are updated to compare against the renamed matrix value so the Windows-vs-Unix branch selection still works. Also swap `macos-15-intel` to `macos-26-intel` for the `x86_64-apple-darwin` release target. Both became GA in the same February 2026 announcement; doing one without the other is an asymmetry not worth keeping in a "preview the freshest images" branch. The `codeql` swift conditional is updated for completeness even though swift is not in the active language matrix. This change is for fork-local CI validation only and should not be merged upstream. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 5aadd6e commit 3afc93c

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
matrix:
2727
os:
28-
- windows-2025
28+
- windows-2025-vs2026
2929
- ubuntu-latest
3030

3131
runs-on: ${{ matrix.os }}
@@ -259,9 +259,9 @@ jobs:
259259
strategy:
260260
matrix:
261261
os:
262-
- windows-latest
262+
- windows-2025-vs2026
263263
- windows-11-arm
264-
- macos-latest
264+
- macos-26
265265
- ubuntu-latest
266266
- ubuntu-24.04-arm
267267
include:
@@ -331,7 +331,7 @@ jobs:
331331
strategy:
332332
matrix:
333333
os:
334-
- windows-latest
334+
- windows-2025-vs2026
335335
- windows-11-arm
336336
include:
337337
- test-args: ""
@@ -450,7 +450,7 @@ jobs:
450450
run: cargo nextest run --workspace --no-fail-fast --exclude gix-error
451451

452452
test-32bit-windows-size-doc:
453-
runs-on: windows-latest
453+
runs-on: windows-2025-vs2026
454454

455455
env:
456456
TARGET: i686-pc-windows-msvc

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# - https://gh.io/supported-runners-and-hardware-resources
3535
# - https://gh.io/using-larger-runners (GitHub.com only)
3636
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
37-
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
37+
runs-on: ${{ (matrix.language == 'swift' && 'macos-26') || 'ubuntu-latest' }}
3838
permissions:
3939
# required for all workflows
4040
security-events: write # Required for uploading SARIF to view in the Security tab.

.github/workflows/release.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -134,18 +134,18 @@ jobs:
134134
- target: s390x-unknown-linux-gnu
135135
os: ubuntu-latest
136136
- target: x86_64-apple-darwin
137-
os: macos-15-intel
137+
os: macos-26-intel
138138
- target: aarch64-apple-darwin
139-
os: macos-latest
139+
os: macos-26
140140
- target: x86_64-pc-windows-msvc
141-
os: windows-latest
141+
os: windows-2025-vs2026
142142
- target: x86_64-pc-windows-gnu
143-
os: windows-latest
143+
os: windows-2025-vs2026
144144
rust: stable-x86_64-gnu
145145
- target: i686-pc-windows-msvc
146-
os: windows-latest
146+
os: windows-2025-vs2026
147147
- target: aarch64-pc-windows-msvc
148-
os: windows-latest
148+
os: windows-2025-vs2026
149149
# On linux we build with musl which causes trouble with open-ssl. For now, just build max-pure there.
150150
# It's a TODO. See https://github.com/GitoxideLabs/gitoxide/issues/1242.
151151
exclude:
@@ -280,7 +280,7 @@ jobs:
280280
cp -- {README.md,LICENSE-*,CHANGELOG.md} "$ARCHIVE/"
281281
282282
- name: Build archive (Windows)
283-
if: matrix.os == 'windows-latest'
283+
if: matrix.os == 'windows-2025-vs2026'
284284
run: |
285285
file -- "$TARGET_DIR/$PROFILE"/{ein,gix}.exe
286286
cp -- "$TARGET_DIR/$PROFILE"/{ein,gix}.exe "$ARCHIVE/"
@@ -290,7 +290,7 @@ jobs:
290290
echo "ASSET_SUM=$ARCHIVE.zip.sha256" >> "$GITHUB_ENV"
291291
292292
- name: Build archive (Unix)
293-
if: matrix.os != 'windows-latest'
293+
if: matrix.os != 'windows-2025-vs2026'
294294
run: |
295295
file -- "$TARGET_DIR/$PROFILE"/{ein,gix}
296296
cp -- "$TARGET_DIR/$PROFILE"/{ein,gix} "$ARCHIVE/"
@@ -306,7 +306,7 @@ jobs:
306306

307307
# Add a macOS universal binary archive for a feature using its built aarch64 and x86_64 assets.
308308
build-macos-universal2-release:
309-
runs-on: macos-latest
309+
runs-on: macos-26
310310

311311
needs: [ create-release, build-release ]
312312

@@ -523,19 +523,19 @@ jobs:
523523
build: [ win-msvc, win-gnu, win32-msvc, win32-gnu ]
524524
include:
525525
- build: win-msvc
526-
os: windows-latest
526+
os: windows-2025-vs2026
527527
rust: stable
528528
target: x86_64-pc-windows-msvc
529529
- build: win-gnu
530-
os: windows-latest
530+
os: windows-2025-vs2026
531531
rust: stable-x86_64-gnu
532532
target: x86_64-pc-windows-gnu
533533
- build: win32-msvc
534-
os: windows-latest
534+
os: windows-2025-vs2026
535535
rust: stable
536536
target: i686-pc-windows-msvc
537537
- build: win32-gnu
538-
os: windows-latest
538+
os: windows-2025-vs2026
539539
rust: stable
540540
target: i686-pc-windows-gnu
541541

0 commit comments

Comments
 (0)