Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 0ab5ba1

Browse files
committed
[DO NOT MERGE] Try dist-aarch64-apple
1 parent aaa4e54 commit 0ab5ba1

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -558,10 +558,20 @@ jobs:
558558
strategy:
559559
matrix:
560560
include:
561-
- name: dist-x86_64-linux
561+
- name: dist-aarch64-apple
562562
env:
563-
CODEGEN_BACKENDS: "llvm,cranelift"
564-
os: ubuntu-20.04-16core-64gb
563+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
564+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
565+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
566+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
567+
USE_XCODE_CLANG: 1
568+
MACOSX_DEPLOYMENT_TARGET: 11.0
569+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
570+
NO_LLVM_ASSERTIONS: 1
571+
NO_DEBUG_ASSERTIONS: 1
572+
NO_OVERFLOW_CHECKS: 1
573+
DIST_REQUIRE_ALL_TOOLS: 1
574+
os: macos-13-xlarge
565575
timeout-minutes: 600
566576
runs-on: "${{ matrix.os }}"
567577
steps:

src/ci/github-actions/ci.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,8 @@ jobs:
542542
<<: *job-macos-xl
543543

544544
# This target only needs to support 11.0 and up as nothing else supports the hardware
545-
- name: dist-aarch64-apple
545+
- &dist-aarch64-apple
546+
name: dist-aarch64-apple
546547
env:
547548
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
548549
RUST_CONFIGURE_ARGS: >-
@@ -703,11 +704,7 @@ jobs:
703704
strategy:
704705
matrix:
705706
include:
706-
- &dist-x86_64-linux
707-
name: dist-x86_64-linux
708-
env:
709-
CODEGEN_BACKENDS: llvm,cranelift
710-
<<: *job-linux-16c
707+
- <<: *dist-aarch64-apple
711708

712709
master:
713710
name: master

0 commit comments

Comments
 (0)