Skip to content

Commit fab9ea1

Browse files
committed
Auto merge of #1550 - mati865:rustup, r=gnzlbg
Use minimal profile for rustup Haven't tested it but should fix issue from #1549 (comment)
2 parents 3a1b3a7 + 792a9a1 commit fab9ea1

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.cirrus.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ task:
55
setup_script:
66
- pkg install -y curl
77
- curl https://sh.rustup.rs -sSf --output rustup.sh
8-
- sh rustup.sh --default-toolchain nightly -y
8+
- sh rustup.sh --default-toolchain nightly -y --profile=minimal
99
- . $HOME/.cargo/env
1010
- rustup default nightly
1111
test_script:
@@ -19,7 +19,7 @@ task:
1919
setup_script:
2020
- pkg install -y curl
2121
- curl https://sh.rustup.rs -sSf --output rustup.sh
22-
- sh rustup.sh -y
22+
- sh rustup.sh -y --profile=minimal
2323
- . $HOME/.cargo/env
2424
- rustup default stable
2525
test_script:
@@ -34,7 +34,7 @@ task:
3434
setup_script:
3535
- pkg install -y curl
3636
- curl https://sh.rustup.rs -sSf --output rustup.sh
37-
- sh rustup.sh --default-toolchain nightly -y
37+
- sh rustup.sh --default-toolchain nightly -y --profile=minimal
3838
- . $HOME/.cargo/env
3939
- rustup default nightly
4040
test_script:

ci/azure-install-rust.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,21 @@ steps:
66
toolchain=nightly
77
fi
88
if command -v rustup; then
9+
# Uncomment when rustup on Azure is updated
10+
#rustup set profile minimal
911
rustup update $toolchain
1012
rustup default $toolchain
1113
else
12-
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $toolchain
14+
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $toolchain --profile=minimal
1315
echo "##vso[task.prependpath]$HOME/.cargo/bin"
1416
fi
1517
displayName: Install rust (unix)
1618
condition: ne( variables['Agent.OS'], 'Windows_NT' )
1719
- script: |
1820
@echo on
1921
if not defined TOOLCHAIN set TOOLCHAIN=nightly
22+
:: Uncomment when rustup on Azure is updated
23+
::rustup set profile minimal
2024
rustup update --no-self-update %TOOLCHAIN%-%TARGET%
2125
rustup default %TOOLCHAIN%-%TARGET%
2226
displayName: Install rust (windows)

0 commit comments

Comments
 (0)