Skip to content

Commit b7132dd

Browse files
committed
Auto merge of #4075 - Turbo87:simplify-ci, r=JohnTitor
CI: Simplify `rustup` usage - `rustup` uses the `minimal` profile by default on GitHub Actions - We don't need the custom `rustup` installation anymore
2 parents 9f84032 + 115e633 commit b7132dd

File tree

1 file changed

+1
-24
lines changed

1 file changed

+1
-24
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,7 @@ jobs:
7474
steps:
7575
- uses: actions/checkout@v2
7676

77-
- name: Install Rust
78-
run: |
79-
rustup set profile minimal
80-
rustup update 1.56.0
81-
rustup default 1.56.0
82-
77+
- run: rustup default 1.56.0
8378
- run: rustup component add rustfmt
8479
- run: rustup component add clippy
8580

@@ -123,26 +118,8 @@ jobs:
123118
steps:
124119
- uses: actions/checkout@v2
125120

126-
- name: Cleanup pre-installed Rust toolchains
127-
# The pre-installed toolchain is under root permission, and this would
128-
# make tarball fail to extract. Here we remove the symlink and install
129-
# our own Rust toolchain if necessary.
130-
run: |
131-
which rustup
132-
which cargo
133-
if [[ -L "$HOME/.cargo" && -L "$HOME/.rustup" ]]; then
134-
rm -v "$HOME/.rustup"
135-
rm -v "$HOME/.cargo"
136-
fi
137-
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
138-
139121
- name: Install ${{ matrix.rust }} Rust
140122
run: |
141-
if [[ ! -d "$HOME/.cargo" || ! -d "$HOME/.rustup" ]]; then
142-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup-init.sh
143-
sh rustup-init.sh -y --default-toolchain none
144-
fi
145-
rustup set profile minimal
146123
rustup update ${{ matrix.rust }}
147124
rustup default ${{ matrix.rust }}
148125

0 commit comments

Comments
 (0)