Skip to content

Commit

Permalink
Merge pull request #1168 from lorbax/fix-rust-toolchain-version-in-sc…
Browse files Browse the repository at this point in the history
…ripts

Use version 1.75.0 of toolchain in scripts
  • Loading branch information
plebhash committed Sep 19, 2024
2 parents ab0ddd6 + 724de47 commit d61cd2a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion scripts/build-on-all-workspaces.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ WORKSPACES="benches common protocols roles utils"

for workspace in $WORKSPACES; do
echo "Executing build on: $workspace"
cargo build --manifest-path="$workspace/Cargo.toml" --
cargo +1.75.0 build --manifest-path="$workspace/Cargo.toml" --
if [ $? -ne 0 ]; then
echo "Build found some errors in: $workspace"
exit 1
Expand Down
4 changes: 2 additions & 2 deletions scripts/clippy-fmt-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ WORKSPACES="benches common protocols roles utils"

for workspace in $WORKSPACES; do
echo "Executing clippy on: $workspace"
cargo clippy --manifest-path="$workspace/Cargo.toml" -- -D warnings -A dead-code
cargo +1.75.0 clippy --manifest-path="$workspace/Cargo.toml" -- -D warnings -A dead-code
if [ $? -ne 0 ]; then
echo "Clippy found some errors in: $workspace"
exit 1
fi

echo "Running tests on: $workspace"
cargo test --manifest-path="$workspace/Cargo.toml"
cargo +1.75 test --manifest-path="$workspace/Cargo.toml"
if [ $? -ne 0 ]; then
echo "Tests failed in: $workspace"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion scripts/code-coverage-report.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/sh

cd roles
RUST_LOG=debug cargo llvm-cov --ignore-filename-regex "utils/message-generator/|experimental/|protocols/" --cobertura --output-path "target/mg_coverage.xml" report
RUST_LOG=debug cargo +1.75.0 llvm-cov --ignore-filename-regex "utils/message-generator/|experimental/|protocols/" --cobertura --output-path "target/mg_coverage.xml" report
2 changes: 1 addition & 1 deletion scripts/message-generator-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ for entry in `ls $search_dir`; do
done

cd roles
RUST_LOG=debug cargo llvm-cov --ignore-filename-regex "utils/message-generator/|experimental/|protocols/" --cobertura --output-path "target/mg_coverage.xml" report
RUST_LOG=debug cargo +1.75.0 llvm-cov --ignore-filename-regex "utils/message-generator/|experimental/|protocols/" --cobertura --output-path "target/mg_coverage.xml" report

0 comments on commit d61cd2a

Please sign in to comment.