ci: move some fast checks to sanity (#32875)

This commit is contained in:
Trent Nelson 2023-08-17 21:58:17 -06:00 committed by GitHub
parent 9260c0f645
commit f1a0cca547
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions

View File

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

View File

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