Skip to content

Commit c0ac9f9

Browse files
committed
chore(ci): upgrade macOS runner to 26
1 parent 4283feb commit c0ac9f9

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
name: Clippy on ${{ matrix.os }}
4141
strategy:
4242
matrix:
43-
os: [ubuntu-24.04, macos-15, windows-2025]
43+
os: [ubuntu-24.04, macos-26, windows-2025]
4444
runs-on: ${{ matrix.os }}
4545
timeout-minutes: 10
4646
steps:
@@ -118,7 +118,7 @@ jobs:
118118
matrix:
119119
include:
120120
- target: aarch64-apple-darwin
121-
os: macos-15
121+
os: macos-26
122122
- target: aarch64-pc-windows-msvc
123123
os: windows-11-arm
124124
- target: aarch64-unknown-linux-gnu
@@ -217,7 +217,7 @@ jobs:
217217
- target: wasm32-wasip1
218218
- target: wasm32-wasip2
219219
- target: x86_64-apple-darwin
220-
os: macos-15-intel
220+
os: macos-26-intel
221221
- target: x86_64-linux-android
222222
# FIXME: Exec format error (os error 8)
223223
# - target: x86_64-unknown-linux-gnux32

libc-test/build.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,9 @@ fn test_apple(target: &str) {
332332

333333
// FIXME(macos): The size is changed in recent macOSes.
334334
"malloc_introspection_t" if x86_64 => true,
335+
336+
// FIXME(macos): The size is changed in macOS 26.
337+
"vm_statistics64" => true,
335338
_ => false,
336339
}
337340
});
@@ -346,6 +349,21 @@ fn test_apple(target: &str) {
346349
// https://github.com/apple-oss-distributions/xnu/commit/e6231be02a03711ca404e5121a151b24afbff733
347350
"TIOCREMOTE" => true,
348351

352+
// FIXME(macos): bumped up on macOS 26
353+
// https://github.com/apple-oss-distributions/xnu/commit/f6217f891ac0bb64f3d375211650a4c1ff8ca1ea
354+
"ELAST" => true,
355+
356+
// FIXME(macos): bumped up on macOS 26, it's sizeof `vm_statistics64_data_t`
357+
"HOST_VM_INFO64_COUNT" => true,
358+
359+
_ => false,
360+
}
361+
});
362+
363+
cfg.skip_alias(move |ty| {
364+
match ty.ident() {
365+
// FIXME(macos): The size is changed in macOS 26.
366+
"vm_statistics64_data_t" => true,
349367
_ => false,
350368
}
351369
});

0 commit comments

Comments
 (0)