diff options
author | bors <bors@rust-lang.org> | 2019-10-15 15:59:12 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2019-10-15 15:59:12 +0000 |
commit | fab9ea1fe0332cc85157defbeef18a4d8ae82e78 (patch) | |
tree | e963f0c92ff868cb0bced607a6cb0e7ef73d5869 | |
parent | 3a1b3a7f4cfd1d527dab749b01e93c1876f806e8 (diff) | |
parent | 792a9a15c5084703ba5d89d8e12967502d5049f2 (diff) | |
download | rust-libc-fab9ea1fe0332cc85157defbeef18a4d8ae82e78.tar.gz |
Auto merge of #1550 - mati865:rustup, r=gnzlbg0.2.64
Use minimal profile for rustup
Haven't tested it but should fix issue from https://github.com/rust-lang/libc/pull/1549#issuecomment-542203074
-rw-r--r-- | .cirrus.yml | 6 | ||||
-rw-r--r-- | ci/azure-install-rust.yml | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 4fb29f5180..28830438ac 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -5,7 +5,7 @@ task: setup_script: - pkg install -y curl - curl https://sh.rustup.rs -sSf --output rustup.sh - - sh rustup.sh --default-toolchain nightly -y + - sh rustup.sh --default-toolchain nightly -y --profile=minimal - . $HOME/.cargo/env - rustup default nightly test_script: @@ -19,7 +19,7 @@ task: setup_script: - pkg install -y curl - curl https://sh.rustup.rs -sSf --output rustup.sh - - sh rustup.sh -y + - sh rustup.sh -y --profile=minimal - . $HOME/.cargo/env - rustup default stable test_script: @@ -34,7 +34,7 @@ task: setup_script: - pkg install -y curl - curl https://sh.rustup.rs -sSf --output rustup.sh - - sh rustup.sh --default-toolchain nightly -y + - sh rustup.sh --default-toolchain nightly -y --profile=minimal - . $HOME/.cargo/env - rustup default nightly test_script: diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml index 87a41ec57d..e78fe32faf 100644 --- a/ci/azure-install-rust.yml +++ b/ci/azure-install-rust.yml @@ -6,10 +6,12 @@ steps: toolchain=nightly fi if command -v rustup; then + # Uncomment when rustup on Azure is updated + #rustup set profile minimal rustup update $toolchain rustup default $toolchain else - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $toolchain + curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $toolchain --profile=minimal echo "##vso[task.prependpath]$HOME/.cargo/bin" fi displayName: Install rust (unix) @@ -17,6 +19,8 @@ steps: - script: | @echo on if not defined TOOLCHAIN set TOOLCHAIN=nightly + :: Uncomment when rustup on Azure is updated + ::rustup set profile minimal rustup update --no-self-update %TOOLCHAIN%-%TARGET% rustup default %TOOLCHAIN%-%TARGET% displayName: Install rust (windows) |