Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

infra: downgrade rust #11681

Merged
merged 3 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading