CI Tweaks (backport #18738) (#18742)

* ci: fix typo

(cherry picked from commit 96a7cedaca)

* ci: suppress cargo tree output

(cherry picked from commit 59cd0556ef)

Co-authored-by: Trent Nelson <trent@solana.com>
This commit is contained in:
mergify[bot]
2021-07-17 06:07:45 +00:00
committed by GitHub
parent df9061b933
commit 3542348c1e
3 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

@ -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"