Skip to content

Commit 1436467

Browse files
committed
Perform try builds for aarch64-apple-darwin
1 parent 3148b32 commit 1436467

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

.github/workflows/ci.yml

+14-3
Original file line numberDiff line numberDiff line change
@@ -545,9 +545,20 @@ jobs:
545545
strategy:
546546
matrix:
547547
include:
548-
- name: dist-x86_64-linux
549-
os: ubuntu-20.04-16core-64gb
550-
env: {}
548+
- name: dist-aarch64-apple
549+
env:
550+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
551+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
552+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
553+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
554+
USE_XCODE_CLANG: 1
555+
MACOSX_DEPLOYMENT_TARGET: 11.0
556+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
557+
NO_LLVM_ASSERTIONS: 1
558+
NO_DEBUG_ASSERTIONS: 1
559+
NO_OVERFLOW_CHECKS: 1
560+
DIST_REQUIRE_ALL_TOOLS: 1
561+
os: macos-13-xlarge
551562
timeout-minutes: 600
552563
runs-on: "${{ matrix.os }}"
553564
steps:

src/ci/github-actions/ci.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,8 @@ jobs:
527527
<<: *job-macos-xl
528528

529529
# This target only needs to support 11.0 and up as nothing else supports the hardware
530-
- name: dist-aarch64-apple
530+
- &dist-aarch64-apple
531+
name: dist-aarch64-apple
531532
env:
532533
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
533534
RUST_CONFIGURE_ARGS: >-
@@ -687,9 +688,7 @@ jobs:
687688
strategy:
688689
matrix:
689690
include:
690-
- &dist-x86_64-linux
691-
name: dist-x86_64-linux
692-
<<: *job-linux-16c
691+
- <<: *dist-aarch64-apple
693692

694693
master:
695694
name: master

0 commit comments

Comments
 (0)