Merge pull request #28 from rust-lang-nursery/1.26.1

sfackler · web-flow · commit b8ec7fb14400 · 2018-05-29T10:07:00.000-07:00
Update to 1.26.1
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,10 @@ language: bash
 services: docker
 
 env:
-  - VERSION=1.26.0 VARIANT=stretch/slim
-  - VERSION=1.26.0 VARIANT=stretch
-  - VERSION=1.26.0 VARIANT=jessie/slim
-  - VERSION=1.26.0 VARIANT=jessie
+  - VERSION=1.26.1 VARIANT=stretch/slim
+  - VERSION=1.26.1 VARIANT=stretch
+  - VERSION=1.26.1 VARIANT=jessie/slim
+  - VERSION=1.26.1 VARIANT=jessie
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
diff --git a/1.26.1/jessie/Dockerfile b/1.26.1/jessie/Dockerfile
@@ -3,7 +3,7 @@ FROM buildpack-deps:jessie
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.26.0
+    RUST_VERSION=1.26.1
 
 RUN set -eux; \
     \
diff --git a/1.26.1/jessie/slim/Dockerfile b/1.26.1/jessie/slim/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:jessie-slim
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.26.0
+    RUST_VERSION=1.26.1
 
 RUN set -eux; \
     apt-get update; \
diff --git a/1.26.1/release-architectures b/1.26.1/release-architectures
diff --git a/1.26.1/rustup-version b/1.26.1/rustup-version
diff --git a/1.26.1/stretch/Dockerfile b/1.26.1/stretch/Dockerfile
@@ -3,7 +3,7 @@ FROM buildpack-deps:stretch
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.26.0
+    RUST_VERSION=1.26.1
 
 RUN set -eux; \
     \
diff --git a/1.26.1/stretch/slim/Dockerfile b/1.26.1/stretch/slim/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:stretch-slim
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.26.0
+    RUST_VERSION=1.26.1
 
 RUN set -eux; \
     apt-get update; \
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -2,7 +2,7 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
-	[1.26.0]='1 1.26 latest'
+	[1.26.1]='1 1.26 latest'
 )
 
 defaultDebianSuite='stretch'

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ FROM buildpack-deps:jessie`
`3`	`3`	`ENV RUSTUP_HOME=/usr/local/rustup \`
`4`	`4`	`CARGO_HOME=/usr/local/cargo \`
`5`	`5`	`PATH=/usr/local/cargo/bin:$PATH \`
`6`		`- RUST_VERSION=1.26.0`
	`6`	`+ RUST_VERSION=1.26.1`
`7`	`7`
`8`	`8`	`RUN set -eux; \`
`9`	`9`	`\`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ FROM buildpack-deps:stretch`
`3`	`3`	`ENV RUSTUP_HOME=/usr/local/rustup \`
`4`	`4`	`CARGO_HOME=/usr/local/cargo \`
`5`	`5`	`PATH=/usr/local/cargo/bin:$PATH \`
`6`		`- RUST_VERSION=1.26.0`
	`6`	`+ RUST_VERSION=1.26.1`
`7`	`7`
`8`	`8`	`RUN set -eux; \`
`9`	`9`	`\`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`set -Eeuo pipefail`
`3`	`3`
`4`	`4`	`declare -A aliases=(`
`5`		`- [1.26.0]='1 1.26 latest'`
	`5`	`+ [1.26.1]='1 1.26 latest'`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`defaultDebianSuite='stretch'`