From 9b1471acae7d7194df219981c57c9a728ca85a96 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Sat, 20 Jul 2019 18:53:16 -0600 Subject: [PATCH] Upgrade to Rust 1.36.0 (#5206) * Upgrade to Rust 1.36.0 * Move test-checks.sh back to stable * update nightly version to 2019-07-19 * use both nightly and stable for checks --- .travis.yml | 2 +- ci/docker-rust/Dockerfile | 2 +- ci/rust-version.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2853fac11..9fa9a0b0f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ os: language: rust cache: cargo rust: - - 1.35.0 + - 1.36.0 install: - source ci/rust-version.sh diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile index ad3884795f..da3a840c84 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/rust-version.sh to pick up the new image tag -FROM rust:1.35.0 +FROM rust:1.36.0 RUN set -x \ && apt update \ diff --git a/ci/rust-version.sh b/ci/rust-version.sh index 5afafc2726..e422f44d0c 100644 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -13,8 +13,8 @@ # $ source ci/rust-version.sh # -stable_version=1.35.0 -nightly_version=2019-06-20 +stable_version=1.36.0 +nightly_version=2019-07-19 export rust_stable="$stable_version" export rust_stable_docker_image=solanalabs/rust:"$stable_version"