Skip to content

Commit

Permalink
Auto merge of #61700 - Mark-Simulacrum:beta-non-dev, r=alexcrichton
Browse files Browse the repository at this point in the history
[beta] Comment out dev key

r? @alexcrichton or @pietroalbini
  • Loading branch information
bors committed Jun 24, 2019
2 parents 07a9dae + 4379216 commit a91f2e5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/ci/docker/dist-various-2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions src/stage0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

0 comments on commit a91f2e5

Please sign in to comment.