From 494f68558d383059b4bfe3eb6d304fdf08639c5e Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Sun, 9 Jun 2019 14:49:45 -0600 Subject: [PATCH 1/2] Comment out dev key --- src/stage0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stage0.txt b/src/stage0.txt index 266eef70f5508..d59ebcfe2f82e 100644 --- a/src/stage0.txt +++ b/src/stage0.txt @@ -12,7 +12,7 @@ # source tarball for a stable release you'll likely see `1.x.0` for rustc and # `0.x.0` for Cargo where they were released on `date`. -date: 2019-05-20 +date: 2019-05-23 rustc: 1.35.0 cargo: 0.36.0 @@ -34,4 +34,4 @@ cargo: 0.36.0 # looking at a beta source tarball and it's uncommented we'll shortly comment it # out. -dev: 1 +#dev: 1 From 43792169735fecad0b7054d092cae4260df4b4d8 Mon Sep 17 00:00:00 2001 From: bgermann Date: Wed, 22 May 2019 22:43:24 +0200 Subject: [PATCH 2/2] Solaris CI: Build with dilos2 stable dilos2-testing has problems since the last repository update, so get the packages from dilos2 stable. Fixes #61022. --- src/ci/docker/dist-various-2/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/docker/dist-various-2/Dockerfile b/src/ci/docker/dist-various-2/Dockerfile index 869ee9883c100..e7d6f201b444e 100644 --- a/src/ci/docker/dist-various-2/Dockerfile +++ b/src/ci/docker/dist-various-2/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get build-dep -y clang llvm && apt-get install -y --no gpg-agent RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486 -RUN add-apt-repository -y 'deb http://apt.dilos.org/dilos dilos2-testing main' +RUN add-apt-repository -y 'deb http://apt.dilos.org/dilos dilos2 main' WORKDIR /tmp COPY dist-various-2/shared.sh /tmp/