Skip to content
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
.vscode/
*.swp

# Qualification and consumer-check output
# Qualification and downstream-check output
/performance-results/
/consumer-checks/**/target/
/checks/**/target/
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions scripts/check_clean_downstream.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -euo pipefail

consumer_checks_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../consumer-checks" && pwd)"
checks_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../checks" && pwd)"
rust_toolchain="${SILO_RUST_TOOLCHAIN:-1.94.1}"
if [[ -n "${SILO_S3_CARGO_TARGET_DIR:-}" ]]; then
target_root="$SILO_S3_CARGO_TARGET_DIR/clean-downstream"
Expand All @@ -15,16 +15,16 @@ export RUSTC_WRAPPER=""

CARGO_TARGET_DIR="$target_root/rust-$rust_toolchain" \
cargo +"$rust_toolchain" check \
--manifest-path "$consumer_checks_root/Cargo.toml" \
--manifest-path "$checks_root/Cargo.toml" \
-p silo-s3-downstream-core-check --locked
CARGO_TARGET_DIR="$target_root/rust-$rust_toolchain" \
cargo +"$rust_toolchain" check \
--manifest-path "$consumer_checks_root/Cargo.toml" \
--manifest-path "$checks_root/Cargo.toml" \
-p silo-s3-downstream-client-check \
--no-default-features --locked
CARGO_TARGET_DIR="$target_root/rust-$rust_toolchain" \
cargo +"$rust_toolchain" check \
--manifest-path "$consumer_checks_root/Cargo.toml" \
--manifest-path "$checks_root/Cargo.toml" \
-p silo-s3-downstream-client-check \
--no-default-features --features foyer-cache --locked

Expand Down
2 changes: 1 addition & 1 deletion scripts/check_dependency_security.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ scan_lockfile() {

for lockfile in \
"$security_root/Cargo.lock" \
"$security_root/consumer-checks/Cargo.lock"
"$security_root/checks/Cargo.lock"
do
if scan_lockfile "$lockfile"; then
echo "forbidden legacy TLS or dependency in $lockfile" >&2
Expand Down
Loading