dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move back to linux builder on try builds

This commit is contained in:
Mark Rousskov 2021-10-25 09:38:04 -04:00
parent 32f3887b9b
commit 00bca4e957
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/ci.yml vendored
View File

@ -532,16 +532,9 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- name: dist-x86_64-apple - name: dist-x86_64-linux
env: os: ubuntu-latest-xl
SCRIPT: "./x.py dist --exclude src/doc --exclude extended && ./x.py dist --target=x86_64-apple-darwin src/doc && ./x.py dist extended" env: {}
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 timeout-minutes: 600
runs-on: "${{ matrix.os }}" runs-on: "${{ matrix.os }}"
steps: steps:

14
src/ci/github-actions/ci.yml
View File

@ -672,17 +672,9 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- name: dist-x86_64-apple - &dist-x86_64-linux
env: name: dist-x86_64-linux
SCRIPT: ./x.py dist --exclude src/doc --exclude extended && ./x.py dist --target=x86_64-apple-darwin src/doc && ./x.py dist extended <<: *job-linux-xl
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: master:
name: master name: master