CI Tweaks (backport #18738) (#18742)

* ci: fix typo (cherry picked from commit 96a7ced) * ci: suppress cargo tree output (cherry picked from commit 59cd055) Co-authored-by: Trent Nelson <[email protected]>
solana-labs · Jul 17, 2021 · 3542348 · 3542348
1 parent df9061b
commit 3542348
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ci/env.sh b/ci/env.sh
@@ -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

diff --git a/ci/test-checks.sh b/ci/test-checks.sh
@@ -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

diff --git a/scripts/increment-cargo-version.sh b/scripts/increment-cargo-version.sh
@@ -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"