Skip to content

Commit

Permalink
infra: downgrade rust (google#11681)
Browse files Browse the repository at this point in the history
Downgrades Rust to nightly at 28th Dec 2023. The version that is build
is:

```sh
 > [2/2] RUN install_rust.sh:                                                                                                                                                                                                                                                          
0.210 + curl https://sh.rustup.rs                                                                                                                                                                                                                                                      
0.210 + sh -s -- -y --default-toolchain=nightly-2023-12-28 --profile=minimal                                                                                                                                                                                                           
0.217   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current                                                                                                                                                                                                  
0.217                                  Dload  Upload   Total   Spent    Left  Speed                                                                                                                                                                                                    
100 26495  100 26495    0     0   205k      0 --:--:-- --:--:-- --:--:--  206k                                                                                                                                                                                                         
0.348 info: downloading installer                                                                                                                                                                                                                                                      
1.603 warning: it looks like you have an existing installation of Rust at:                                                                                                                                                                                                             
1.603 warning: /usr/local/bin                                                                                                                                                                                                                                                          
1.603 warning: It is recommended that rustup be the primary Rust installation.                                                                                                                                                                                                         
1.603 warning: Otherwise you may have confusion unless you are careful with your PATH                                                                                                                                                                                                  
1.603 warning: If you are sure that you want both rustup and your already installed Rust                                                                                                                                                                                               
1.603 warning: then please reply `y' or `yes' or set RUSTUP_INIT_SKIP_PATH_CHECK to yes                                                                                                                                                                                                
1.603 warning: or pass `-y' to ignore all ignorable checks.                                                                                                                                                                                                                            
1.603 error: cannot install while Rust is installed                                                                                                                                                                                                                                    
1.603 warning: continuing (because the -y flag is set and the error is ignorable)                                                                                                                                                                                                      
1.622 info: profile set to 'minimal'                                                                                                                                                                                                                                                   
1.622 info: default host triple is x86_64-unknown-linux-gnu                                                                                                                                                                                                                            
1.622 info: syncing channel updates for 'nightly-2023-12-28-x86_64-unknown-linux-gnu'                                                                                                                                                                                                  
2.595 info: latest update on 2023-12-28, rust version 1.77.0-nightly (89e2160c4 2023-12-27)                                                                                                                                                                                            
2.595 info: downloading component 'cargo'                                                                                                                                                                                                                                              
3.274 info: downloading component 'rust-std'      
```

---------

Signed-off-by: David Korczynski <[email protected]>
  • Loading branch information
DavidKorczynski authored Mar 13, 2024
1 parent f6c57d4 commit 54cf7a9
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions infra/base-images/base-builder/install_rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
################################################################################

curl https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly --profile=minimal
curl https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly-2023-12-28 --profile=minimal
cargo install cargo-fuzz && rm -rf /rust/registry
# Needed to recompile rust std library for MSAN
rustup component add rust-src --toolchain nightly
rustup component add rust-src --toolchain nightly-2023-12-28
2 changes: 1 addition & 1 deletion projects/askama/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ for CRATE_DIR in ${FUZZ_CRATE_DIRS[@]};
do
echo "Building crate: $CRATE_DIR"
cd $CRATE_DIR
cargo +nightly fuzz build -O
cargo +nightly-2023-12-28 fuzz build -O
FUZZ_TARGET_OUTPUT_DIR=fuzz/target/x86_64-unknown-linux-gnu/release
for f in fuzz/fuzz_targets/*.rs
do
Expand Down
2 changes: 1 addition & 1 deletion projects/crosvm/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cd crosvm

# Build crosvm fuzzers
# Unset the SRC variable as it will interfere with minijail's common.mk framework.
env -u SRC cargo +nightly fuzz build -O
env -u SRC cargo +nightly-2023-12-28 fuzz build -O

# Copy fuzzer binaries to $OUT
FUZZ_TARGET_OUTPUT_DIR="target/x86_64-unknown-linux-gnu/release"
Expand Down
2 changes: 1 addition & 1 deletion projects/gitoxide/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ for CRATE_DIR in ${FUZZ_CRATE_DIRS[@]};
do
echo "Building crate: $CRATE_DIR"
cd $CRATE_DIR
cargo +nightly fuzz build -O --debug-assertions
cargo +nightly-2023-12-28 fuzz build -O --debug-assertions
FUZZ_TARGET_OUTPUT_DIR=$CARGO_BUILD_TARGET_DIR/x86_64-unknown-linux-gnu/release
for f in fuzz/fuzz_targets/*.rs
do
Expand Down
2 changes: 1 addition & 1 deletion projects/linkerd2-proxy/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ then
export CFLAGS=""
fi

BUILD_FUZZER="cargo +nightly fuzz build "
BUILD_FUZZER="cargo +nightly-2023-12-28 fuzz build "
TARGET_PATH="./fuzz/target/x86_64-unknown-linux-gnu/release"
BASE="$SRC/linkerd2-proxy/linkerd"

Expand Down
2 changes: 1 addition & 1 deletion projects/naga/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
################################################################################

cargo +nightly fuzz build -O
cargo +nightly-2023-12-28 fuzz build -O
fuzz_release=$SRC/wgpu/target/x86_64-unknown-linux-gnu/release
cp $fuzz_release/spv_parser $OUT/
cp $fuzz_release/wgsl_parser $OUT/
2 changes: 1 addition & 1 deletion projects/opendal/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# build fuzz targets
cd $SRC/opendal/core
cargo +nightly fuzz build -O --debug-assertions
cargo +nightly-2023-12-28 fuzz build -O --debug-assertions

# copy fuzz targets to $OUT
targets=(
Expand Down

0 comments on commit 54cf7a9

Please sign in to comment.