Skip to content

Commit c9fe5a8

Browse files
committed
tmp: make try builds use x64-darwin job
1 parent a6f38a9 commit c9fe5a8

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -574,9 +574,18 @@ jobs:
574574
strategy:
575575
matrix:
576576
include:
577-
- name: dist-x86_64-linux
578-
os: ubuntu-20.04-xl
579-
env: {}
577+
- name: dist-x86_64-apple
578+
env:
579+
SCRIPT: PGO_HOST=x86_64-apple-darwin python3 src/ci/stage-build.py python3 x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
580+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin"
581+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
582+
MACOSX_DEPLOYMENT_TARGET: 10.7
583+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
584+
NO_LLVM_ASSERTIONS: 1
585+
NO_DEBUG_ASSERTIONS: 1
586+
NO_OVERFLOW_CHECKS: 1
587+
DIST_REQUIRE_ALL_TOOLS: 1
588+
os: macos-12-xl
580589
timeout-minutes: 600
581590
runs-on: "${{ matrix.os }}"
582591
steps:

src/ci/github-actions/ci.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -749,9 +749,18 @@ jobs:
749749
strategy:
750750
matrix:
751751
include:
752-
- &dist-x86_64-linux
753-
name: dist-x86_64-linux
754-
<<: *job-linux-xl
752+
- name: dist-x86_64-apple
753+
env:
754+
SCRIPT: PGO_HOST=x86_64-apple-darwin python3 src/ci/stage-build.py python3 x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
755+
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false --set rust.lto=thin
756+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
757+
MACOSX_DEPLOYMENT_TARGET: 10.7
758+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
759+
NO_LLVM_ASSERTIONS: 1
760+
NO_DEBUG_ASSERTIONS: 1
761+
NO_OVERFLOW_CHECKS: 1
762+
DIST_REQUIRE_ALL_TOOLS: 1
763+
<<: *job-macos-xl
755764

756765
master:
757766
name: master

0 commit comments

Comments
 (0)