Skip to content

Commit 10d9abf

Browse files
committed
[HACK] macos trybuild
1 parent 6bcd502 commit 10d9abf

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -583,10 +583,20 @@ jobs:
583583
strategy:
584584
matrix:
585585
include:
586-
- name: dist-x86_64-linux
586+
- name: dist-aarch64-apple
587587
env:
588-
CODEGEN_BACKENDS: "llvm,cranelift"
589-
os: ubuntu-20.04-16core-64gb
588+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
589+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
590+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
591+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
592+
USE_XCODE_CLANG: 1
593+
MACOSX_DEPLOYMENT_TARGET: 11.0
594+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
595+
NO_LLVM_ASSERTIONS: 1
596+
NO_DEBUG_ASSERTIONS: 1
597+
NO_OVERFLOW_CHECKS: 1
598+
DIST_REQUIRE_ALL_TOOLS: 1
599+
os: macos-14
590600
timeout-minutes: 600
591601
runs-on: "${{ matrix.os }}"
592602
steps:

src/ci/github-actions/ci.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,8 @@ jobs:
553553
<<: *job-macos-xl
554554

555555
# This target only needs to support 11.0 and up as nothing else supports the hardware
556-
- name: dist-aarch64-apple
556+
- &dist-aarch64-apple
557+
name: dist-aarch64-apple
557558
env:
558559
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
559560
RUST_CONFIGURE_ARGS: >-
@@ -734,12 +735,7 @@ jobs:
734735
strategy:
735736
matrix:
736737
include:
737-
- &dist-x86_64-linux
738-
name: dist-x86_64-linux
739-
env:
740-
CODEGEN_BACKENDS: llvm,cranelift
741-
<<: *job-linux-16c
742-
738+
- <<: *dist-aarch64-apple
743739

744740
master:
745741
name: master

0 commit comments

Comments
 (0)