diff options
| author | bors <bors@rust-lang.org> | 2022-06-22 12:12:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-22 12:12:47 +0000 |
| commit | fc10a373c12fa7aefc97a7cef7a41c0c3008ad78 (patch) | |
| tree | b86163a57975952e60d784be41e2f2cc00e1a4e6 | |
| parent | 061f3b07f5fd5cecef4e8f5f587187be4af87c5b (diff) | |
| parent | 1bb4ab3acf249cb1a65f1d8cf7c7b857a0af2218 (diff) | |
| download | rust-libc-fc10a373c12fa7aefc97a7cef7a41c0c3008ad78.tar.gz | |
Auto merge of #2831 - JohnTitor:macos-12-ci, r=Amanieu
Upgrade macOS image to 12
macOS 12 on GHA is now GA: https://github.blog/changelog/2022-06-13-github-actions-macos-12-for-github-hosted-runners-is-now-generally-available/
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
| -rw-r--r-- | .github/workflows/bors.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 2 | ||||
| -rw-r--r-- | libc-test/build.rs | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml index 2ad8c67f6d..dbe80b4de4 100644 --- a/.github/workflows/bors.yml +++ b/.github/workflows/bors.yml @@ -29,7 +29,7 @@ jobs: macos: name: macOS - runs-on: macos-11 + runs-on: macos-12 strategy: fail-fast: true matrix: @@ -223,7 +223,7 @@ jobs: build_channels_macos: name: Build Channels macOS needs: macos - runs-on: macos-11 + runs-on: macos-12 env: OS: macos strategy: @@ -290,7 +290,7 @@ jobs: semver_macos: if: ${{ false }} # This is currently broken name: Semver macOS - runs-on: macos-11 + runs-on: macos-12 continue-on-error: true steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f4ab96d20..823f2463e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: macos: name: macOS - runs-on: macos-11 + runs-on: macos-12 strategy: fail-fast: true matrix: diff --git a/libc-test/build.rs b/libc-test/build.rs index 1f6a4a7e0c..ac3f54baf9 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -321,9 +321,6 @@ fn test_apple(target: &str) { // close calls the close_nocancel system call "close" => true, - // macOs 12 minimum - "backtrace_async" => true, - _ => false, } }); |