OpenE2K/libc-rs
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #1550 - mati865:rustup, r=gnzlbg

Browse Source 
Use minimal profile for rustup

Haven't tested it but should fix issue from https://github.com/rust-lang/libc/pull/1549#issuecomment-542203074
This commit is contained in:
bors 2019-10-15 15:59:12 +00:00
commit fab9ea1fe0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.cirrus.yml
View File

@ -5,7 +5,7 @@ task:
setup_script: setup_script:
- pkg install -y curl - pkg install -y curl
- curl https://sh.rustup.rs -sSf --output rustup.sh - 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 - . $HOME/.cargo/env
- rustup default nightly - rustup default nightly
test_script: test_script:
@ -19,7 +19,7 @@ task:
setup_script: setup_script:
- pkg install -y curl - pkg install -y curl
- curl https://sh.rustup.rs -sSf --output rustup.sh - curl https://sh.rustup.rs -sSf --output rustup.sh
- sh rustup.sh -y - sh rustup.sh -y --profile=minimal
- . $HOME/.cargo/env - . $HOME/.cargo/env
- rustup default stable - rustup default stable
test_script: test_script:
@ -34,7 +34,7 @@ task:
setup_script: setup_script:
- pkg install -y curl - pkg install -y curl
- curl https://sh.rustup.rs -sSf --output rustup.sh - 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 - . $HOME/.cargo/env
- rustup default nightly - rustup default nightly
test_script: test_script:

6
ci/azure-install-rust.yml
View File

@ -6,10 +6,12 @@ steps:
toolchain=nightly toolchain=nightly
fi fi
if command -v rustup; then if command -v rustup; then
# Uncomment when rustup on Azure is updated
#rustup set profile minimal
rustup update $toolchain rustup update $toolchain
rustup default $toolchain rustup default $toolchain
else 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" echo "##vso[task.prependpath]$HOME/.cargo/bin"
fi fi
displayName: Install rust (unix) displayName: Install rust (unix)
@ -17,6 +19,8 @@ steps:
- script: | - script: |
@echo on @echo on
if not defined TOOLCHAIN set TOOLCHAIN=nightly 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 update --no-self-update %TOOLCHAIN%-%TARGET%
rustup default %TOOLCHAIN%-%TARGET% rustup default %TOOLCHAIN%-%TARGET%
displayName: Install rust (windows) displayName: Install rust (windows)