From 3542348c1e57869fdb4696dc2a7adbcaeb73d41f Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 17 Jul 2021 06:07:45 +0000
Subject: [PATCH] CI Tweaks (backport #18738) (#18742)

* ci: fix typo

(cherry picked from commit 96a7cedaca084760e8709d456c2e46c2ccd55ea7)

* ci: suppress cargo tree output

(cherry picked from commit 59cd0556ef4f6907bb8c362fcd132c0049812f53)

Co-authored-by: Trent Nelson <trent@solana.com>
---
 ci/env.sh                          | 2 +-
 ci/test-checks.sh                  | 2 +-
 scripts/increment-cargo-version.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/env.sh b/ci/env.sh
index df7ed1ce6aeb32..973f4c85323bf1 100644
--- 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
index 7352a59806281f..8cf93132f00dbf 100755
--- 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
index e15534ae5f82e3..283aaab9c2f196 100755
--- 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"