diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fa999a42ef81..af91296e6b44 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,7 +40,7 @@ jobs: name: Clippy on ${{ matrix.os }} strategy: matrix: - os: [ubuntu-24.04, macos-15, windows-2025] + os: [ubuntu-24.04, macos-26, windows-2025] runs-on: ${{ matrix.os }} timeout-minutes: 10 steps: @@ -118,7 +118,7 @@ jobs: matrix: include: - target: aarch64-apple-darwin - os: macos-15 + os: macos-26 - target: aarch64-pc-windows-msvc os: windows-11-arm - target: aarch64-unknown-linux-gnu @@ -217,7 +217,7 @@ jobs: - target: wasm32-wasip1 - target: wasm32-wasip2 - target: x86_64-apple-darwin - os: macos-15-intel + os: macos-26-intel - target: x86_64-linux-android # FIXME: Exec format error (os error 8) # - target: x86_64-unknown-linux-gnux32 diff --git a/libc-test/build.rs b/libc-test/build.rs index 6854e3c47d8f..aa15bece653f 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -332,6 +332,9 @@ fn test_apple(target: &str) { // FIXME(macos): The size is changed in recent macOSes. "malloc_introspection_t" if x86_64 => true, + + // FIXME(macos): The size is changed in macOS 26. + "vm_statistics64" => true, _ => false, } }); @@ -346,6 +349,21 @@ fn test_apple(target: &str) { // https://github.com/apple-oss-distributions/xnu/commit/e6231be02a03711ca404e5121a151b24afbff733 "TIOCREMOTE" => true, + // FIXME(macos): bumped up on macOS 26 + // https://github.com/apple-oss-distributions/xnu/commit/f6217f891ac0bb64f3d375211650a4c1ff8ca1ea + "ELAST" => true, + + // FIXME(macos): bumped up on macOS 26, it's sizeof `vm_statistics64_data_t` + "HOST_VM_INFO64_COUNT" => true, + + _ => false, + } + }); + + cfg.skip_alias(move |ty| { + match ty.ident() { + // FIXME(macos): The size is changed in macOS 26. + "vm_statistics64_data_t" => true, _ => false, } });