Skip to content

Commit 8e217bd

Browse files
authored
Merge pull request #51 from rust-lang/1.40
Update to 1.40.0
2 parents 8d0f254 + 3898d19 commit 8e217bd

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ services: docker
33

44
env:
55
#VERSIONS
6-
- VERSION=1.39.0 VARIANT=stretch
7-
- VERSION=1.39.0 VARIANT=stretch/slim
8-
- VERSION=1.39.0 VARIANT=buster
9-
- VERSION=1.39.0 VARIANT=buster/slim
10-
- VERSION=1.39.0 VARIANT=alpine3.10
6+
- VERSION=1.40.0 VARIANT=stretch
7+
- VERSION=1.40.0 VARIANT=stretch/slim
8+
- VERSION=1.40.0 VARIANT=buster
9+
- VERSION=1.40.0 VARIANT=buster/slim
10+
- VERSION=1.40.0 VARIANT=alpine3.10
1111
#VERSIONS
1212

1313
install:

1.39.0/alpine3.10/Dockerfile renamed to 1.40.0/alpine3.10/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apk add --no-cache \
77
ENV RUSTUP_HOME=/usr/local/rustup \
88
CARGO_HOME=/usr/local/cargo \
99
PATH=/usr/local/cargo/bin:$PATH \
10-
RUST_VERSION=1.39.0
10+
RUST_VERSION=1.40.0
1111

1212
RUN set -eux; \
1313
url="https://static.rust-lang.org/rustup/archive/1.20.2/x86_64-unknown-linux-musl/rustup-init"; \

1.39.0/buster/Dockerfile renamed to 1.40.0/buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM buildpack-deps:buster
33
ENV RUSTUP_HOME=/usr/local/rustup \
44
CARGO_HOME=/usr/local/cargo \
55
PATH=/usr/local/cargo/bin:$PATH \
6-
RUST_VERSION=1.39.0
6+
RUST_VERSION=1.40.0
77

88
RUN set -eux; \
99
dpkgArch="$(dpkg --print-architecture)"; \

1.39.0/buster/slim/Dockerfile renamed to 1.40.0/buster/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM debian:buster-slim
33
ENV RUSTUP_HOME=/usr/local/rustup \
44
CARGO_HOME=/usr/local/cargo \
55
PATH=/usr/local/cargo/bin:$PATH \
6-
RUST_VERSION=1.39.0
6+
RUST_VERSION=1.40.0
77

88
RUN set -eux; \
99
apt-get update; \

1.39.0/stretch/Dockerfile renamed to 1.40.0/stretch/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM buildpack-deps:stretch
33
ENV RUSTUP_HOME=/usr/local/rustup \
44
CARGO_HOME=/usr/local/cargo \
55
PATH=/usr/local/cargo/bin:$PATH \
6-
RUST_VERSION=1.39.0
6+
RUST_VERSION=1.40.0
77

88
RUN set -eux; \
99
dpkgArch="$(dpkg --print-architecture)"; \

1.39.0/stretch/slim/Dockerfile renamed to 1.40.0/stretch/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM debian:stretch-slim
33
ENV RUSTUP_HOME=/usr/local/rustup \
44
CARGO_HOME=/usr/local/cargo \
55
PATH=/usr/local/cargo/bin:$PATH \
6-
RUST_VERSION=1.39.0
6+
RUST_VERSION=1.40.0
77

88
RUN set -eux; \
99
apt-get update; \

x.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import subprocess
77
import sys
88

9-
rust_version = "1.39.0"
9+
rust_version = "1.40.0"
1010
rustup_version = "1.20.2"
1111

1212
DebianArch = namedtuple("DebianArch", ["bashbrew", "dpkg", "rust"])

0 commit comments

Comments
 (0)