diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2021-10-20 12:15:45 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2021-10-20 14:43:23 -0400 |
| commit | 5503dd9b0e2bb8518147591c66090729b5bea1bd (patch) | |
| tree | f142fa189b3ab15a4f7be7e1e1db98dcf9e0fb93 | |
| parent | 9a3c02473b922e91ad7c37beed8bd48da0ef05db (diff) | |
| download | rust-5503dd9b0e2bb8518147591c66090729b5bea1bd.tar.gz rust-5503dd9b0e2bb8518147591c66090729b5bea1bd.zip | |
[do not merge] try build
| -rw-r--r-- | .github/workflows/ci.yml | 13 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 12 |
2 files changed, 21 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c3f5e3100d..84842899929 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -528,9 +528,16 @@ jobs: strategy: matrix: include: - - name: dist-x86_64-linux - os: ubuntu-latest-xl - env: {} + - name: dist-x86_64-apple + env: + SCRIPT: "./x.py dist --exclude src/doc --exclude extended && ./x.py dist --target=x86_64-apple-darwin src/doc && ./x.py dist extended" + RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false" + RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + MACOSX_DEPLOYMENT_TARGET: 10.7 + NO_LLVM_ASSERTIONS: 1 + NO_DEBUG_ASSERTIONS: 1 + DIST_REQUIRE_ALL_TOOLS: 1 + os: macos-latest timeout-minutes: 600 runs-on: "${{ matrix.os }}" steps: diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 2b37a6fde7e..9616594b5a3 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -668,7 +668,17 @@ jobs: strategy: matrix: include: - - *dist-x86_64-linux + - name: dist-x86_64-apple + env: + SCRIPT: ./x.py dist --exclude src/doc --exclude extended && ./x.py dist --target=x86_64-apple-darwin src/doc && ./x.py dist extended + RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false + RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + MACOSX_DEPLOYMENT_TARGET: 10.7 + NO_LLVM_ASSERTIONS: 1 + NO_DEBUG_ASSERTIONS: 1 + DIST_REQUIRE_ALL_TOOLS: 1 + <<: *job-macos-xl + master: name: master |