From 70985f82f1b538fd51dc62408919c2bf53b3528d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 6 Nov 2020 02:29:26 +0000 Subject: [PATCH] CI: Check monorepo for consistent crate versions (bp #13431) (#13433) * increment-cargo-version.sh: Add check subcommand (cherry picked from commit 5d4015358a0c6743a8b7db4ef57aa9481fb9d227) * CI: Check monorepo for consistent crate versions (cherry picked from commit 7a4e293b3b99e1cafe137ca89322c9a3084b2066) Co-authored-by: Trent Nelson --- ci/test-checks.sh | 2 ++ scripts/increment-cargo-version.sh | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/ci/test-checks.sh b/ci/test-checks.sh index 9c30eb86cb..929e3f3d64 100755 --- a/ci/test-checks.sh +++ b/ci/test-checks.sh @@ -10,6 +10,8 @@ source ci/rust-version.sh nightly eval "$(ci/channel-info.sh)" cargo="$(readlink -f "./cargo")" +scripts/increment-cargo-version.sh check + echo --- build environment ( set -x diff --git a/scripts/increment-cargo-version.sh b/scripts/increment-cargo-version.sh index e423cf8c29..2815af042f 100755 --- a/scripts/increment-cargo-version.sh +++ b/scripts/increment-cargo-version.sh @@ -78,6 +78,19 @@ minor) ;; dropspecial) ;; +check) + badTomls=() + for Cargo_toml in "${Cargo_tomls[@]}"; do + if ! grep "^version *= *\"$currentVersion\"$" "$Cargo_toml" &>/dev/null; then + badTomls+=("$Cargo_toml") + fi + done + if [[ ${#badTomls[@]} -ne 0 ]]; then + echo "Error: Incorrect crate version specified in: ${badTomls[*]}" + exit 1 + fi + exit 0 + ;; -*) if [[ $1 =~ ^-[A-Za-z0-9]*$ ]]; then SPECIAL="$1"