Overhaul cargo/rustc version management

2019-03-14 19:41:05 -07:00
parent 47ddbbe53b
commit 8f25548781
17 changed files with 96 additions and 84 deletions
--- a/ci/publish-crate.sh
+++ b/ci/publish-crate.sh
@@ -55,7 +55,8 @@ for crate in "${CRATES[@]}"; do
    set -x
    # TODO: the rocksdb package does not build with the stock rust docker image,
    # so use the solana rust docker image until this is resolved upstream
-    ci/docker-run.sh solanalabs/rust:1.32.0 bash -exc "cd $crate; $cargoCommand"
+    source ci/rust-version.sh
+    ci/docker-run.sh "$rust_stable_docker_image" bash -exc "cd $crate; $cargoCommand"
    #ci/docker-run.sh rust bash -exc "cd $crate; $cargoCommand"
  )
 done