Skip to content

Commit

Permalink
ci: move some fast checks to sanity (#32875)
Browse files Browse the repository at this point in the history
  • Loading branch information
t-nelson authored Aug 18, 2023
1 parent 9260c0f commit f1a0cca
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 0 additions & 18 deletions ci/test-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,6 @@ source ci/rust-version.sh nightly
eval "$(ci/channel-info.sh)"
cargoNightly="$(readlink -f "./cargo") nightly"

scripts/increment-cargo-version.sh check

if ! [ -v SOLANA_CI_ALLOW_STALE_CARGO_LOCK ] ; then
# Disallow uncommitted Cargo.lock changes
(
_ scripts/cargo-for-all-lock-files.sh tree >/dev/null
set +e
if ! _ git diff --exit-code; then
cat <<EOF 1>&2
Error: Uncommitted Cargo.lock changes.
Run './scripts/cargo-for-all-lock-files.sh tree' and commit the result.
EOF
exit 1
fi
)
fi

echo --- build environment
(
set -x
Expand Down
18 changes: 18 additions & 0 deletions ci/test-sanity.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,22 @@ _ ci/check-channel-version.sh
_ ci/nits.sh
_ ci/check-ssh-keys.sh

scripts/increment-cargo-version.sh check

if ! [ -v SOLANA_CI_ALLOW_STALE_CARGO_LOCK ] ; then
# Disallow uncommitted Cargo.lock changes
(
_ scripts/cargo-for-all-lock-files.sh tree >/dev/null
set +e
if ! _ git diff --exit-code; then
cat <<EOF 1>&2
Error: Uncommitted Cargo.lock changes.
Run './scripts/cargo-for-all-lock-files.sh tree' and commit the result.
EOF
exit 1
fi
)
fi

echo --- ok

0 comments on commit f1a0cca

Please sign in to comment.