Skip to content

Commit bb1ec34

Browse files
committed
Pass --no-self-update to rustup update
Hopefully this will help some of the recent CI issues. (backport <#4306>) (cherry picked from commit 8efcf7b)
1 parent c809c73 commit bb1ec34

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v4
2424
- name: Setup Rust toolchain
25-
run: ./ci/install-rust.sh
25+
run: ./ci/install-rust.sh && rustup component add rustfmt
2626
- name: Check style
2727
run: ./ci/style.sh
2828

ci/install-rust.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if [ "$os" = "windows" ] && [ -n "${TARGET:-}" ]; then
2424
fi
2525

2626
rustup set profile minimal
27-
rustup update --force "$toolchain"
27+
rustup update --force "$toolchain" --no-self-update
2828
rustup default "$toolchain"
2929

3030
if [ -n "${TARGET:-}" ]; then

ci/style.sh

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22

33
set -eux
44

5-
if [ -n "${CI:-}" ]; then
6-
rustup toolchain install nightly -c rustfmt --allow-downgrade
7-
rustup override set nightly
8-
9-
check="--check"
10-
fi
5+
[ -n "${CI:-}" ] && check="--check"
116

127
cargo test --manifest-path libc-test/Cargo.toml --test style -- --nocapture
138

0 commit comments

Comments
 (0)