Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

CI Tweaks (backport #18738) #18741

Merged
merged 2 commits into from
Jul 17, 2021
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
2 changes: 1 addition & 1 deletion ci/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ else
export CI_REPO_SLUG=
export CI_TAG=
# Don't override ci/run-local.sh
if [[ -z $CL_LOCAL_RUN ]]; then
if [[ -z $CI_LOCAL_RUN ]]; then
export CI_OS_NAME=
fi
fi
Expand Down
2 changes: 1 addition & 1 deletion ci/test-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ scripts/increment-cargo-version.sh check

# Disallow uncommitted Cargo.lock changes
(
_ scripts/cargo-for-all-lock-files.sh tree
_ scripts/cargo-for-all-lock-files.sh tree >/dev/null
set +e
if ! _ git diff --exit-code; then
echo -e "\nError: Uncommitted Cargo.lock changes" 1>&2
Expand Down
2 changes: 1 addition & 1 deletion scripts/increment-cargo-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ for file in "${markdownFiles[@]}"; do
done

# Update cargo lock files
scripts/cargo-for-all-lock-files.sh tree
scripts/cargo-for-all-lock-files.sh tree >/dev/null

echo "$currentVersion -> $newVersion"

Expand Down