From cc24ae26bc795f20dad08bb637d979004e5f2391 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Tue, 14 Nov 2023 18:12:41 +0900 Subject: [PATCH] Upgrade macOS image to 13 --- .github/workflows/bors.yml | 8 ++++---- .github/workflows/main.yml | 2 +- libc-test/Cargo.toml | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml index c42d40be76cf6..63ae19f9c5d94 100644 --- a/.github/workflows/bors.yml +++ b/.github/workflows/bors.yml @@ -38,7 +38,7 @@ jobs: contents: read # to fetch code (actions/checkout) name: macOS - runs-on: macos-12 + runs-on: macos-13 strategy: fail-fast: true matrix: @@ -262,9 +262,9 @@ jobs: max-parallel: 4 matrix: target: - - { toolchain: stable, os: macos-12 } - - { toolchain: beta, os: macos-12 } - - { toolchain: nightly, os: macos-12 } + - { toolchain: stable, os: macos-13 } + - { toolchain: beta, os: macos-13 } + - { toolchain: nightly, os: macos-13 } # Use macOS 11 for older toolchains as newer Xcode donesn't work well. # FIXME: Disabled due to: # error: failed to parse registry's information for: serde diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7a0e646bddd70..eaf4ffec2ad3c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: macos: name: macOS - runs-on: macos-12 + runs-on: macos-13 strategy: fail-fast: true matrix: diff --git a/libc-test/Cargo.toml b/libc-test/Cargo.toml index 6594300a9d2bf..56b53f73699a0 100644 --- a/libc-test/Cargo.toml +++ b/libc-test/Cargo.toml @@ -16,7 +16,8 @@ version = "0.2.150" default-features = false [build-dependencies] -cc = "1.0.61" +# FIXME: 1.0.84 has a bug about macOS version detection. +cc = "=1.0.83" # FIXME: Use fork ctest until the maintainer gets back. ctest2 = "0.4.3"