Skip to content

Commit

Permalink
[HACK] macos trybuild
Browse files Browse the repository at this point in the history
  • Loading branch information
shepmaster committed Jan 30, 2024
1 parent 6bcd502 commit 10d9abf
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
16 changes: 13 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -583,10 +583,20 @@ jobs:
strategy:
matrix:
include:
- name: dist-x86_64-linux
- name: dist-aarch64-apple
env:
CODEGEN_BACKENDS: "llvm,cranelift"
os: ubuntu-20.04-16core-64gb
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
SELECT_XCODE: /Applications/Xcode_13.4.1.app
USE_XCODE_CLANG: 1
MACOSX_DEPLOYMENT_TARGET: 11.0
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
NO_LLVM_ASSERTIONS: 1
NO_DEBUG_ASSERTIONS: 1
NO_OVERFLOW_CHECKS: 1
DIST_REQUIRE_ALL_TOOLS: 1
os: macos-14
timeout-minutes: 600
runs-on: "${{ matrix.os }}"
steps:
Expand Down
10 changes: 3 additions & 7 deletions src/ci/github-actions/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,8 @@ jobs:
<<: *job-macos-xl

# This target only needs to support 11.0 and up as nothing else supports the hardware
- name: dist-aarch64-apple
- &dist-aarch64-apple
name: dist-aarch64-apple
env:
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
RUST_CONFIGURE_ARGS: >-
Expand Down Expand Up @@ -734,12 +735,7 @@ jobs:
strategy:
matrix:
include:
- &dist-x86_64-linux
name: dist-x86_64-linux
env:
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-linux-16c

- <<: *dist-aarch64-apple

master:
name: master
Expand Down

0 comments on commit 10d9abf

Please sign in to comment.