Skip to content

Commit 8b07c88

Browse files
committed
Auto merge of #112067 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
[stable] Prepare 1.70.0 release r? `@Mark-Simulacrum`
2 parents 2687f47 + 7cfea71 commit 8b07c88

File tree

4 files changed

+256
-14
lines changed

4 files changed

+256
-14
lines changed

.github/workflows/ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ jobs:
322322
NO_DEBUG_ASSERTIONS: 1
323323
NO_OVERFLOW_CHECKS: 1
324324
DIST_REQUIRE_ALL_TOOLS: 1
325-
os: macos-12-xl
325+
os: macos-latest
326326
- name: dist-apple-various
327327
env:
328328
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -333,7 +333,7 @@ jobs:
333333
NO_LLVM_ASSERTIONS: 1
334334
NO_DEBUG_ASSERTIONS: 1
335335
NO_OVERFLOW_CHECKS: 1
336-
os: macos-12-xl
336+
os: macos-latest
337337
- name: dist-x86_64-apple-alt
338338
env:
339339
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -344,7 +344,7 @@ jobs:
344344
NO_LLVM_ASSERTIONS: 1
345345
NO_DEBUG_ASSERTIONS: 1
346346
NO_OVERFLOW_CHECKS: 1
347-
os: macos-12-xl
347+
os: macos-latest
348348
- name: x86_64-apple-1
349349
env:
350350
SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude tests/run-make-fulldeps"
@@ -355,7 +355,7 @@ jobs:
355355
NO_LLVM_ASSERTIONS: 1
356356
NO_DEBUG_ASSERTIONS: 1
357357
NO_OVERFLOW_CHECKS: 1
358-
os: macos-12-xl
358+
os: macos-latest
359359
- name: x86_64-apple-2
360360
env:
361361
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -366,7 +366,7 @@ jobs:
366366
NO_LLVM_ASSERTIONS: 1
367367
NO_DEBUG_ASSERTIONS: 1
368368
NO_OVERFLOW_CHECKS: 1
369-
os: macos-12-xl
369+
os: macos-latest
370370
- name: dist-aarch64-apple
371371
env:
372372
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -381,7 +381,7 @@ jobs:
381381
NO_OVERFLOW_CHECKS: 1
382382
DIST_REQUIRE_ALL_TOOLS: 1
383383
JEMALLOC_SYS_WITH_LG_PAGE: 14
384-
os: macos-12-xl
384+
os: macos-latest
385385
- name: x86_64-msvc-1
386386
env:
387387
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"

0 commit comments

Comments
 (0)