Skip to content

Commit d5ca830

Browse files
alambxudong963
authored andcommitted
Fix verification script and extended tests due to rustup changes (#14990)
* Fix rustup toolchain errors * Use standard builder setup in extended tests * fix yaml * sprinkle sudo * Revert "sprinkle sudo" This reverts commit 0ed0e0a. * no contianer * use rust container * fix extended jobs * fix * Update .github/workflows/extended.yml
1 parent ec4862f commit d5ca830

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/extended.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
linux-build-lib:
3737
name: linux build test
3838
runs-on: ubuntu-latest
39+
# note: do not use amd/rust container to preserve disk space
3940
steps:
4041
- uses: actions/checkout@v4
4142
with:
@@ -45,7 +46,7 @@ jobs:
4546
run: |
4647
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
4748
source $HOME/.cargo/env
48-
rustup default stable
49+
rustup toolchain install
4950
- name: Install Protobuf Compiler
5051
run: sudo apt-get install -y protobuf-compiler
5152
- name: Prepare cargo build
@@ -58,6 +59,7 @@ jobs:
5859
name: cargo test 'extended_tests' (amd64)
5960
needs: linux-build-lib
6061
runs-on: ubuntu-latest
62+
# note: do not use amd/rust container to preserve disk space
6163
steps:
6264
- uses: actions/checkout@v4
6365
with:
@@ -69,7 +71,7 @@ jobs:
6971
run: |
7072
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
7173
source $HOME/.cargo/env
72-
rustup default stable
74+
rustup toolchain install
7375
- name: Install Protobuf Compiler
7476
run: sudo apt-get install -y protobuf-compiler
7577
# For debugging, test binaries can be large.

dev/release/verify-release-candidate.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,11 @@ test_source_distribution() {
117117

118118
# build and test rust
119119

120+
# install the needed version of rust defined in rust-toolchain.toml
121+
rustup toolchain install
122+
120123
# raises on any formatting errors
121-
rustup component add rustfmt --toolchain stable
124+
rustup component add rustfmt
122125
cargo fmt --all -- --check
123126

124127
# Clone testing repositories into the expected location

0 commit comments

Comments
 (0)