Skip to content

Commit 62d83db

Browse files
committed
Auto merge of #60665 - pietroalbini:upgrade-ci-images, r=alexcrichton
Upgrade non-LTS Ubuntu images in CI This PR bumps `dist-various-2` to 18.04 LTS and both `x86_64-gnu` and `x86_64-gnu-debug` to 19.04. Another change is the switch to [rust-lang/mirror-google-fuchsia-zircon](https://github.com/rust-lang/mirror-google-fuchsia-zircon) as the Zircon repository, used during Fuchsia tests: the original repository ([fuchsia.googlesource.com/zircon](https://fuchsia.googlesource.com/zircon)) is now behind a login wall and it doesn't contain anything at all. r? @alexcrichton cc @cramertj -- what's happening on the Fuchsia side?
2 parents ef01f29 + c98a27c commit 62d83db

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

src/ci/docker/dist-various-2/Dockerfile

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
FROM ubuntu:17.10
1+
FROM ubuntu:18.04
22

33
COPY scripts/cross-apt-packages.sh /scripts/
44
RUN sh /scripts/cross-apt-packages.sh
55

6-
RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends \
6+
# Enable source repositories, which are disabled by default on Ubuntu >= 18.04
7+
RUN sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list
8+
9+
RUN apt-get update && apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends \
710
build-essential \
811
gcc-multilib \
912
libedit-dev \
@@ -15,7 +18,10 @@ RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommend
1518
nodejs \
1619
python2.7-dev \
1720
software-properties-common \
18-
unzip
21+
unzip \
22+
# Needed for apt-key to work:
23+
dirmngr \
24+
gpg-agent
1925

2026
RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486
2127
RUN add-apt-repository -y 'deb http://apt.dilos.org/dilos dilos2-testing main'

src/ci/docker/dist-various-2/build-fuchsia-toolchain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pushd zircon > /dev/null
1010

1111
# Download sources
1212
git init
13-
git remote add origin https://fuchsia.googlesource.com/zircon
13+
git remote add origin https://github.com/rust-lang-nursery/mirror-google-fuchsia-zircon
1414
git fetch --depth=1 origin $ZIRCON
1515
git reset --hard FETCH_HEAD
1616

src/ci/docker/x86_64-gnu-debug/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.10
1+
FROM ubuntu:19.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \

src/ci/docker/x86_64-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.10
1+
FROM ubuntu:19.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \

0 commit comments

Comments
 (0)