diff options
| author | bors <bors@rust-lang.org> | 2021-10-25 14:40:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-25 14:40:45 +0000 |
| commit | 84c2a8505dcdfa0e38e05f72066480ea51ba9cbd (patch) | |
| tree | 75ad7b93989f6bc6fdf172205e4360d0222d86b8 /src/ci/github-actions | |
| parent | 235d9853d80f93d31b9c4ae044d6f5c4de3e7255 (diff) | |
| parent | 21af58173f71c16c1d8b111e7455982d2932ce69 (diff) | |
| download | rust-84c2a8505dcdfa0e38e05f72066480ea51ba9cbd.tar.gz rust-84c2a8505dcdfa0e38e05f72066480ea51ba9cbd.zip | |
Auto merge of #90265 - GuillaumeGomez:rollup-gx3ficp, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #90017 (Add a couple tests for normalize under binder issues) - #90079 (enable `i8mm` target feature on aarch64 and arm) - #90233 (Tooltip overflow) - #90257 (Changed slice.swap documentation for better readability) - #90261 (Move back to linux builder on try builds) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 14 |
1 files changed, 3 insertions, 11 deletions
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 |