From 9b24e857c74a98bf67c12141c5690e3b24453b56 Mon Sep 17 00:00:00 2001 From: Scott Schafer Date: Thu, 11 Aug 2022 10:22:21 -0500 Subject: [PATCH] bump to rust version 1.63.0 and rustup 1.25.1 --- .travis.yml | 12 ++++++------ {1.62.1 => 1.63.0}/alpine3.15/Dockerfile | 8 ++++---- {1.62.1 => 1.63.0}/alpine3.16/Dockerfile | 8 ++++---- {1.62.1 => 1.63.0}/bullseye/Dockerfile | 12 ++++++------ {1.62.1 => 1.63.0}/bullseye/slim/Dockerfile | 12 ++++++------ {1.62.1 => 1.63.0}/buster/Dockerfile | 12 ++++++------ {1.62.1 => 1.63.0}/buster/slim/Dockerfile | 12 ++++++------ x.py | 4 ++-- 8 files changed, 40 insertions(+), 40 deletions(-) rename {1.62.1 => 1.63.0}/alpine3.15/Dockerfile (78%) rename {1.62.1 => 1.63.0}/alpine3.16/Dockerfile (78%) rename {1.62.1 => 1.63.0}/bullseye/Dockerfile (67%) rename {1.62.1 => 1.63.0}/bullseye/slim/Dockerfile (72%) rename {1.62.1 => 1.63.0}/buster/Dockerfile (67%) rename {1.62.1 => 1.63.0}/buster/slim/Dockerfile (72%) diff --git a/.travis.yml b/.travis.yml index e0e6eb1..2920925 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,12 @@ services: docker env: #VERSIONS - - VERSION=1.62.1 VARIANT=buster - - VERSION=1.62.1 VARIANT=buster/slim - - VERSION=1.62.1 VARIANT=bullseye - - VERSION=1.62.1 VARIANT=bullseye/slim - - VERSION=1.62.1 VARIANT=alpine3.15 - - VERSION=1.62.1 VARIANT=alpine3.16 + - VERSION=1.63.0 VARIANT=buster + - VERSION=1.63.0 VARIANT=buster/slim + - VERSION=1.63.0 VARIANT=bullseye + - VERSION=1.63.0 VARIANT=bullseye/slim + - VERSION=1.63.0 VARIANT=alpine3.15 + - VERSION=1.63.0 VARIANT=alpine3.16 #VERSIONS install: diff --git a/1.62.1/alpine3.15/Dockerfile b/1.63.0/alpine3.15/Dockerfile similarity index 78% rename from 1.62.1/alpine3.15/Dockerfile rename to 1.63.0/alpine3.15/Dockerfile index 1ea869b..0ad4e9f 100644 --- a/1.62.1/alpine3.15/Dockerfile +++ b/1.63.0/alpine3.15/Dockerfile @@ -7,16 +7,16 @@ RUN apk add --no-cache \ ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.62.1 + RUST_VERSION=1.63.0 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='bdf022eb7cba403d0285bb62cbc47211f610caec24589a72af70e1e900663be9' ;; \ - aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='89ce657fe41e83186f5a6cdca4e0fd40edab4fd41b0f9161ac6241d49fbdbbbe' ;; \ + x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \ + aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \ *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \ esac; \ - url="https://static.rust-lang.org/rustup/archive/1.24.3/${rustArch}/rustup-init"; \ + url="https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init"; \ wget "$url"; \ echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ chmod +x rustup-init; \ diff --git a/1.62.1/alpine3.16/Dockerfile b/1.63.0/alpine3.16/Dockerfile similarity index 78% rename from 1.62.1/alpine3.16/Dockerfile rename to 1.63.0/alpine3.16/Dockerfile index 8368ba7..a0fb14c 100644 --- a/1.62.1/alpine3.16/Dockerfile +++ b/1.63.0/alpine3.16/Dockerfile @@ -7,16 +7,16 @@ RUN apk add --no-cache \ ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.62.1 + RUST_VERSION=1.63.0 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='bdf022eb7cba403d0285bb62cbc47211f610caec24589a72af70e1e900663be9' ;; \ - aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='89ce657fe41e83186f5a6cdca4e0fd40edab4fd41b0f9161ac6241d49fbdbbbe' ;; \ + x86_64) rustArch='x86_64-unknown-linux-musl'; rustupSha256='95427cb0592e32ed39c8bd522fe2a40a746ba07afb8149f91e936cddb4d6eeac' ;; \ + aarch64) rustArch='aarch64-unknown-linux-musl'; rustupSha256='7855404cdc50c20040c743800c947b6f452490d47f8590a4a83bc6f75d1d8eda' ;; \ *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \ esac; \ - url="https://static.rust-lang.org/rustup/archive/1.24.3/${rustArch}/rustup-init"; \ + url="https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init"; \ wget "$url"; \ echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ chmod +x rustup-init; \ diff --git a/1.62.1/bullseye/Dockerfile b/1.63.0/bullseye/Dockerfile similarity index 67% rename from 1.62.1/bullseye/Dockerfile rename to 1.63.0/bullseye/Dockerfile index b162175..7f0870a 100644 --- a/1.62.1/bullseye/Dockerfile +++ b/1.63.0/bullseye/Dockerfile @@ -3,18 +3,18 @@ FROM buildpack-deps:bullseye ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.62.1 + RUST_VERSION=1.63.0 RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)"; \ case "${dpkgArch##*-}" in \ - amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338' ;; \ - armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='67777ac3bc17277102f2ed73fd5f14c51f4ca5963adadf7f174adf4ebc38747b' ;; \ - arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='32a1532f7cef072a667bac53f1a5542c99666c4071af0c9549795bbdb2069ec1' ;; \ - i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='e50d1deb99048bc5782a0200aa33e4eea70747d49dffdc9d06812fd22a372515' ;; \ + amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='48c5ecfd1409da93164af20cf4ac2c6f00688b15eb6ba65047f654060c844d85' ;; \ + arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='0e0be29c560ad958ba52fcf06b3ea04435cb3cd674fbe11ce7d954093b9504fd' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ - url="https://static.rust-lang.org/rustup/archive/1.24.3/${rustArch}/rustup-init"; \ + url="https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init"; \ wget "$url"; \ echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ chmod +x rustup-init; \ diff --git a/1.62.1/bullseye/slim/Dockerfile b/1.63.0/bullseye/slim/Dockerfile similarity index 72% rename from 1.62.1/bullseye/slim/Dockerfile rename to 1.63.0/bullseye/slim/Dockerfile index 184e660..3606ade 100644 --- a/1.62.1/bullseye/slim/Dockerfile +++ b/1.63.0/bullseye/slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:bullseye-slim ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.62.1 + RUST_VERSION=1.63.0 RUN set -eux; \ apt-get update; \ @@ -15,13 +15,13 @@ RUN set -eux; \ ; \ dpkgArch="$(dpkg --print-architecture)"; \ case "${dpkgArch##*-}" in \ - amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338' ;; \ - armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='67777ac3bc17277102f2ed73fd5f14c51f4ca5963adadf7f174adf4ebc38747b' ;; \ - arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='32a1532f7cef072a667bac53f1a5542c99666c4071af0c9549795bbdb2069ec1' ;; \ - i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='e50d1deb99048bc5782a0200aa33e4eea70747d49dffdc9d06812fd22a372515' ;; \ + amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='48c5ecfd1409da93164af20cf4ac2c6f00688b15eb6ba65047f654060c844d85' ;; \ + arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='0e0be29c560ad958ba52fcf06b3ea04435cb3cd674fbe11ce7d954093b9504fd' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ - url="https://static.rust-lang.org/rustup/archive/1.24.3/${rustArch}/rustup-init"; \ + url="https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init"; \ wget "$url"; \ echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ chmod +x rustup-init; \ diff --git a/1.62.1/buster/Dockerfile b/1.63.0/buster/Dockerfile similarity index 67% rename from 1.62.1/buster/Dockerfile rename to 1.63.0/buster/Dockerfile index db3ec4b..aadb37e 100644 --- a/1.62.1/buster/Dockerfile +++ b/1.63.0/buster/Dockerfile @@ -3,18 +3,18 @@ FROM buildpack-deps:buster ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.62.1 + RUST_VERSION=1.63.0 RUN set -eux; \ dpkgArch="$(dpkg --print-architecture)"; \ case "${dpkgArch##*-}" in \ - amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338' ;; \ - armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='67777ac3bc17277102f2ed73fd5f14c51f4ca5963adadf7f174adf4ebc38747b' ;; \ - arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='32a1532f7cef072a667bac53f1a5542c99666c4071af0c9549795bbdb2069ec1' ;; \ - i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='e50d1deb99048bc5782a0200aa33e4eea70747d49dffdc9d06812fd22a372515' ;; \ + amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='48c5ecfd1409da93164af20cf4ac2c6f00688b15eb6ba65047f654060c844d85' ;; \ + arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='0e0be29c560ad958ba52fcf06b3ea04435cb3cd674fbe11ce7d954093b9504fd' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ - url="https://static.rust-lang.org/rustup/archive/1.24.3/${rustArch}/rustup-init"; \ + url="https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init"; \ wget "$url"; \ echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ chmod +x rustup-init; \ diff --git a/1.62.1/buster/slim/Dockerfile b/1.63.0/buster/slim/Dockerfile similarity index 72% rename from 1.62.1/buster/slim/Dockerfile rename to 1.63.0/buster/slim/Dockerfile index bbacf09..fdad252 100644 --- a/1.62.1/buster/slim/Dockerfile +++ b/1.63.0/buster/slim/Dockerfile @@ -3,7 +3,7 @@ FROM debian:buster-slim ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.62.1 + RUST_VERSION=1.63.0 RUN set -eux; \ apt-get update; \ @@ -15,13 +15,13 @@ RUN set -eux; \ ; \ dpkgArch="$(dpkg --print-architecture)"; \ case "${dpkgArch##*-}" in \ - amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338' ;; \ - armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='67777ac3bc17277102f2ed73fd5f14c51f4ca5963adadf7f174adf4ebc38747b' ;; \ - arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='32a1532f7cef072a667bac53f1a5542c99666c4071af0c9549795bbdb2069ec1' ;; \ - i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='e50d1deb99048bc5782a0200aa33e4eea70747d49dffdc9d06812fd22a372515' ;; \ + amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='5cc9ffd1026e82e7fb2eec2121ad71f4b0f044e88bca39207b3f6b769aaa799c' ;; \ + armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='48c5ecfd1409da93164af20cf4ac2c6f00688b15eb6ba65047f654060c844d85' ;; \ + arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='e189948e396d47254103a49c987e7fb0e5dd8e34b200aa4481ecc4b8e41fb929' ;; \ + i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='0e0be29c560ad958ba52fcf06b3ea04435cb3cd674fbe11ce7d954093b9504fd' ;; \ *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac; \ - url="https://static.rust-lang.org/rustup/archive/1.24.3/${rustArch}/rustup-init"; \ + url="https://static.rust-lang.org/rustup/archive/1.25.1/${rustArch}/rustup-init"; \ wget "$url"; \ echo "${rustupSha256} *rustup-init" | sha256sum -c -; \ chmod +x rustup-init; \ diff --git a/x.py b/x.py index 4296c15..b1d6a01 100755 --- a/x.py +++ b/x.py @@ -6,8 +6,8 @@ import subprocess import sys -rust_version = "1.62.1" -rustup_version = "1.24.3" +rust_version = "1.63.0" +rustup_version = "1.25.1" DebianArch = namedtuple("DebianArch", ["bashbrew", "dpkg", "rust"])