diff options
| author | Jake Goulding <jake.goulding@gmail.com> | 2024-01-30 14:19:07 -0500 |
|---|---|---|
| committer | Jake Goulding <jake.goulding@gmail.com> | 2024-02-04 13:52:00 -0500 |
| commit | f47cb984b6266555a17c91f727f44a76f60fa17c (patch) | |
| tree | ac9801b28267c867957e3ae24a413e084277a054 /.github/workflows | |
| parent | 671eb38a4e5fadb75548841ec7ae31224eea0593 (diff) | |
| download | rust-f47cb984b6266555a17c91f727f44a76f60fa17c.tar.gz rust-f47cb984b6266555a17c91f727f44a76f60fa17c.zip | |
Re-enable M1 runners on GitHub Actions
This reverts commit 0f9844d10cc8210f1c0ef784ef8d67a1e073c3c1.
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/ci.yml | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02a2193ad88..1f7776be6c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -364,8 +364,8 @@ jobs: os: macos-13 - name: dist-aarch64-apple env: - SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2" - RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin --enable-full-tools --enable-sanitizers --enable-profiler --disable-docs --set rust.jemalloc" + 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 @@ -375,8 +375,20 @@ jobs: NO_DEBUG_ASSERTIONS: 1 NO_OVERFLOW_CHECKS: 1 DIST_REQUIRE_ALL_TOOLS: 1 - JEMALLOC_SYS_WITH_LG_PAGE: 14 - os: macos-13 + os: macos-13-xlarge + - name: aarch64-apple + env: + SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin" + RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc" + 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 + os: macos-13-xlarge - name: x86_64-msvc env: RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler" |