Add rustc/cargo version check

ci/test-large-network.sh

@@ -3,10 +3,17 @@
 here=$(dirname "$0")
 cd "$here"/..
 
+if ! ci/version-check.sh stable; then
+  # This job doesn't run within a container, try once to upgrade tooling on a
+  # version check failure
+  rustup install stable
+  ci/version-check.sh stable
+fi
+export RUST_BACKTRACE=1
+
 ./fetch-perf-libs.sh
 export LD_LIBRARY_PATH+=:$PWD
 
-export RUST_BACKTRACE=1
 export RUST_LOG=multinode=info
 
 set -x

ci/test-nightly.sh

@@ -2,9 +2,8 @@
 
 cd "$(dirname "$0")/.."
 
+ci/version-check.sh nightly
 export RUST_BACKTRACE=1
-rustc --version
-cargo --version
 
 _() {
   echo "--- $*"

ci/test-stable-perf.sh

@@ -2,11 +2,17 @@
 
 cd "$(dirname "$0")/.."
 
-./fetch-perf-libs.sh
+if ! ci/version-check.sh stable; then
+  # This job doesn't run within a container, try once to upgrade tooling on a
+  # version check failure
+  rustup install stable
+  ci/version-check.sh stable
+fi
+export RUST_BACKTRACE=1
 
+./fetch-perf-libs.sh
 export LD_LIBRARY_PATH=$PWD:/usr/local/cuda/lib64
 export PATH=$PATH:/usr/local/cuda/bin
-export RUST_BACKTRACE=1
 
 _() {
   echo "--- $*"

ci/test-stable.sh

@@ -2,9 +2,8 @@
 
 cd "$(dirname "$0")/.."
 
+ci/version-check.sh stable
 export RUST_BACKTRACE=1
-rustc --version
-cargo --version
 
 _() {
   echo "--- $*"

ci/version-check.sh

@@ -0,0 +1,35 @@
+#!/bin/bash -e
+
+require() {
+  declare expectedProgram="$1"
+  declare expectedVersion="$2"
+
+  read -r program version _ < <($expectedProgram -V)
+
+  declare ok=true
+  [[ $program = "$expectedProgram" ]] || ok=false
+  [[ $version =~ $expectedVersion ]] || ok=false
+
+  echo "Found $program $version"
+  if ! $ok; then
+    echo Error: expected "$expectedProgram $expectedVersion"
+    exit 1
+  fi
+}
+
+case ${1:-stable} in
+nightly)
+  require rustc 1.29.[0-9]+-nightly
+  require cargo 1.29.[0-9]+-nightly
+  ;;
+stable)
+  require rustc 1.28.[0-9]+
+  require cargo 1.28.[0-9]+
+  ;;
+*)
+  echo Error: unknown argument: "$1"
+  exit 1
+  ;;
+esac
+
+exit 0