Skip to content

Commit fc10a37

Browse files
committed
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 <[email protected]>
2 parents 061f3b0 + 1bb4ab3 commit fc10a37

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.github/workflows/bors.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
macos:
3131
name: macOS
32-
runs-on: macos-11
32+
runs-on: macos-12
3333
strategy:
3434
fail-fast: true
3535
matrix:
@@ -223,7 +223,7 @@ jobs:
223223
build_channels_macos:
224224
name: Build Channels macOS
225225
needs: macos
226-
runs-on: macos-11
226+
runs-on: macos-12
227227
env:
228228
OS: macos
229229
strategy:
@@ -290,7 +290,7 @@ jobs:
290290
semver_macos:
291291
if: ${{ false }} # This is currently broken
292292
name: Semver macOS
293-
runs-on: macos-11
293+
runs-on: macos-12
294294
continue-on-error: true
295295
steps:
296296
- uses: actions/checkout@v3

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
macos:
2929
name: macOS
30-
runs-on: macos-11
30+
runs-on: macos-12
3131
strategy:
3232
fail-fast: true
3333
matrix:

libc-test/build.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,6 @@ fn test_apple(target: &str) {
321321
// close calls the close_nocancel system call
322322
"close" => true,
323323

324-
// macOs 12 minimum
325-
"backtrace_async" => true,
326-
327324
_ => false,
328325
}
329326
});

0 commit comments

Comments
 (0)