File tree Expand file tree Collapse file tree 2 files changed +11
-11
lines changed
Expand file tree Collapse file tree 2 files changed +11
-11
lines changed Original file line number Diff line number Diff line change 44# SPDX-License-Identifier: Apache-2.0
55
66set -eu -o pipefail
7+ shopt -s lastpipe
78
89FC_TOOLS_DIR=$( dirname $( realpath $0 ) )
910source " $FC_TOOLS_DIR /functions"
@@ -66,16 +67,15 @@ for file in "${files_to_change[@]}"; do
6667 sed -i " s/$prev_ver /$version /" " $file "
6768done
6869
69- # Run `cargo check` to update firecracker and jailer versions in
70+ CHANGED=()
71+ # Run `cargo check` to update firecracker and jailer versions in all
7072# `Cargo.lock`.
71- say " Updating lockfile..."
72- cargo check
73- CHANGED=(Cargo.lock)
74-
75- cd tests/integration_tests/security/demo_seccomp
76- cargo check
77- cd -
78- CHANGED+=(tests/integration_tests/security/demo_seccomp/Cargo.lock)
73+ # NOTE: This will break if it finds paths with spaces in them
74+ find . -path ./build -prune -o -name Cargo.lock -print | while read -r cargo_lock; do
75+ say " Updating $cargo_lock ..."
76+ (cd " $( dirname " $cargo_lock " ) " ; cargo check)
77+ CHANGED+=(" $cargo_lock " )
78+ done
7979
8080# Update credits.
8181say " Updating credits..."
Original file line number Diff line number Diff line change @@ -90,10 +90,10 @@ PROFILE_DIR=$(get-profile-dir "$PROFILE")
9090CARGO_TARGET=$ARCH -unknown-linux-$LIBC
9191CARGO_TARGET_DIR=build/cargo_target/$CARGO_TARGET /$PROFILE_DIR
9292
93- if [[ $VERSION =~ " -dirty$ " ]]; then
93+ if [[ $VERSION = * -dirty ]]; then
9494 say_warn " Building dirty version.. dirty because:"
9595 git status -s --untracked-files=no
96- git diff
96+ git --no-pager diff
9797fi
9898
9999CARGO_REGISTRY_DIR=" build/cargo_registry"
You can’t perform that action at this time.
0 commit comments