From 28938b027d47467207bdf4498fb89447038877d2 Mon Sep 17 00:00:00 2001 From: brooks Date: Thu, 9 Mar 2023 21:41:26 -0500 Subject: [PATCH 1/2] Upgrades Rust to 1.68.0 --- ci/docker-rust-nightly/Dockerfile | 2 +- ci/docker-rust/Dockerfile | 2 +- ci/rust-version.sh | 2 +- rust-toolchain.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile index b53020d4672436..1c946219945701 100644 --- a/ci/docker-rust-nightly/Dockerfile +++ b/ci/docker-rust-nightly/Dockerfile @@ -1,4 +1,4 @@ -FROM solanalabs/rust:1.67.1 +FROM solanalabs/rust:1.68.0 ARG date RUN set -x \ diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile index ee730ae3404392..89dc0920617353 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.67.1 +FROM rust:1.68.0 RUN set -x \ && apt update \ diff --git a/ci/rust-version.sh b/ci/rust-version.sh index 501d2a2bd0dc2d..b75f254d1ba475 100644 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -29,7 +29,7 @@ fi if [[ -n $RUST_NIGHTLY_VERSION ]]; then nightly_version="$RUST_NIGHTLY_VERSION" else - nightly_version=2023-01-22 + nightly_version=2023-03-09 fi diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 588ffd57885e05..421bf0f8b668be 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.67.1" +channel = "1.68.0" From 617c378741e0ec5426d456ecb20bc0e2740f3683 Mon Sep 17 00:00:00 2001 From: brooks Date: Thu, 16 Mar 2023 09:35:57 -0400 Subject: [PATCH 2/2] sets nightly to 2023-02-08 --- ci/rust-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/rust-version.sh b/ci/rust-version.sh index b75f254d1ba475..651419f77beaef 100644 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -29,7 +29,7 @@ fi if [[ -n $RUST_NIGHTLY_VERSION ]]; then nightly_version="$RUST_NIGHTLY_VERSION" else - nightly_version=2023-03-09 + nightly_version=2023-02-08 fi