From a340b18b19cab51d806bb62adceba75549d3594a Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 25 Oct 2018 16:48:34 -0700
Subject: [PATCH] Upgrade to rust 1.30

---
 ci/buildkite.yml          | 2 +-
 ci/docker-rust/Dockerfile | 2 +-
 ci/docker-solana/build.sh | 2 +-
 ci/version-check.sh       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ci/buildkite.yml b/ci/buildkite.yml
index 779d11c9ab..dc58c9ee5c 100644
--- a/ci/buildkite.yml
+++ b/ci/buildkite.yml
@@ -1,5 +1,5 @@
 steps:
-  - command: "ci/docker-run.sh solanalabs/rust:1.29.1 ci/test-stable.sh"
+  - command: "ci/docker-run.sh solanalabs/rust:1.30.0 ci/test-stable.sh"
     name: "stable [public]"
     env:
       CARGO_TARGET_CACHE_NAME: "stable"
diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile
index 2232b64604..3d4f434c9e 100644
--- a/ci/docker-rust/Dockerfile
+++ b/ci/docker-rust/Dockerfile
@@ -1,6 +1,6 @@
 # Note: when the rust version is changed also modify
 # ci/buildkite.yml to pick up the new image tag
-FROM rust:1.29.2
+FROM rust:1.30.0
 
 RUN set -x && \
     apt update && \
diff --git a/ci/docker-solana/build.sh b/ci/docker-solana/build.sh
index 274dbc2da2..6b818d2224 100755
--- a/ci/docker-solana/build.sh
+++ b/ci/docker-solana/build.sh
@@ -17,7 +17,7 @@ if [[ -z $CHANNEL ]]; then
 fi
 
 rm -rf usr/
-../docker-run.sh solanalabs/rust:1.29.1 \
+../docker-run.sh solanalabs/rust:1.30.0 \
   cargo install --path . --root ci/docker-solana/usr
 cp -f entrypoint.sh usr/bin/solana-entrypoint.sh
 ../../scripts/install-native-programs.sh usr/bin/
diff --git a/ci/version-check.sh b/ci/version-check.sh
index 72ef69b240..daad013d5b 100755
--- a/ci/version-check.sh
+++ b/ci/version-check.sh
@@ -23,8 +23,8 @@ nightly)
   require cargo 1.31.[0-9]+-nightly
   ;;
 stable)
-  require rustc 1.29.[0-9]+
-  require cargo 1.29.[0-9]+
+  require rustc 1.30.[0-9]+
+  require cargo 1.30.[0-9]+
   ;;
 *)
   echo Error: unknown argument: "$1"