diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2021-10-25 16:34:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-25 16:34:55 +0200 |
| commit | 21af58173f71c16c1d8b111e7455982d2932ce69 (patch) | |
| tree | 45909b9f77cb2dacc07db298fc06ca32ab49378f | |
| parent | 3697624e013f7d117cd46a2b154b89df89a5af83 (diff) | |
| parent | 00bca4e957b80658493e746245cd0c894b527a29 (diff) | |
| download | rust-21af58173f71c16c1d8b111e7455982d2932ce69.tar.gz rust-21af58173f71c16c1d8b111e7455982d2932ce69.zip | |
Rollup merge of #90261 - Mark-Simulacrum:fix-try, r=pietroalbini
Move back to linux builder on try builds Apparently deleted the wrong line when trying to revert changes to try in #90100 which I now see still contains the do not merge commit -- maybe I forgot to force push the local changes I had pending or something. r? `@pietroalbini`
| -rw-r--r-- | .github/workflows/ci.yml | 13 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 14 |
2 files changed, 6 insertions, 21 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 580120b25a2..407db519d51 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -532,16 +532,9 @@ jobs: strategy: matrix: include: - - 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 + - name: dist-x86_64-linux + os: ubuntu-latest-xl + env: {} 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 76ee324302e..fbb3042d0d6 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -672,17 +672,9 @@ jobs: strategy: matrix: include: - - 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 - + - &dist-x86_64-linux + name: dist-x86_64-linux + <<: *job-linux-xl master: name: master |