Skip to content

Commit 4ac8346

Browse files
borsbors
committed
Auto merge of #1337 - gnzlbg:update_ubuntu, r=gnzlbg
Update CI from ubuntu 16.04 (EOL) to 19.04 Closes #1333 .
2 parents 39ca01c + 8eceb62 commit 4ac8346

File tree

55 files changed

+2367
-1649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2367
-1649
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ matrix:
204204
stage: tier2
205205
- env: TARGET=x86_64-unknown-linux-musl
206206
stage: tier2
207-
- env: TARGET=wasm32-unknown-wasi
207+
- env: TARGET=wasm32-wasi
208208
rust: nightly
209209
stage: tier2
210210

‎ci/android-install-sdk.sh

+3
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ case "$1" in
4545
;;
4646
esac;
4747

48+
# See: https://stackoverflow.com/a/51644855/1422197
49+
export JAVA_OPTS='-XX:+IgnoreUnrecognizedVMOptions --add-modules java.se.ee'
50+
4851
# --no_https avoids
4952
# javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found
5053
yes | ./sdk/tools/bin/sdkmanager --licenses --no_https

‎ci/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ aarch64-fuchsia \
115115
armv5te-unknown-linux-gnueabi \
116116
armv5te-unknown-linux-musleabi \
117117
i686-pc-windows-gnu \
118+
wasm32-wasi \
118119
x86_64-fortanix-unknown-sgx \
119120
x86_64-fuchsia \
120121
x86_64-pc-windows-gnu \
@@ -199,7 +200,6 @@ thumbv7neon-linux-androideabi \
199200
thumbv7neon-unknown-linux-gnueabihf \
200201
thumbv8m.main-none-eabi \
201202
x86_64-pc-windows-msvc
202-
x86_64-unknown-bitrig \
203203
x86_64-unknown-dragonfly \
204204
x86_64-unknown-haiku \
205205
x86_64-unknown-hermit \

‎ci/docker/aarch64-linux-android/Dockerfile

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

33
RUN dpkg --add-architecture i386 && \
44
apt-get update && \
@@ -9,7 +9,7 @@ RUN dpkg --add-architecture i386 && \
99
python \
1010
unzip \
1111
expect \
12-
openjdk-9-jre \
12+
openjdk-11-jre \
1313
libstdc++6:i386 \
1414
libpulse0 \
1515
gcc \

‎ci/docker/aarch64-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:17.10
1+
FROM ubuntu:19.04
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc libc6-dev ca-certificates \
44
gcc-aarch64-linux-gnu libc6-dev-arm64-cross qemu-user

‎ci/docker/aarch64-unknown-linux-musl/Dockerfile

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

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc make libc6-dev git curl ca-certificates \

‎ci/docker/arm-linux-androideabi/Dockerfile

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

33
RUN dpkg --add-architecture i386 && \
44
apt-get update && \
@@ -9,7 +9,7 @@ RUN dpkg --add-architecture i386 && \
99
python \
1010
unzip \
1111
expect \
12-
openjdk-9-jre \
12+
openjdk-11-jre \
1313
libstdc++6:i386 \
1414
libpulse0 \
1515
gcc \

‎ci/docker/arm-unknown-linux-gnueabihf/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:17.10
1+
FROM ubuntu:19.04
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc libc6-dev ca-certificates \
44
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user

‎ci/docker/arm-unknown-linux-musleabihf/Dockerfile

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

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc make libc6-dev git curl ca-certificates \

‎ci/docker/asmjs-unknown-emscripten/Dockerfile

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

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

‎ci/docker/i686-linux-android/Dockerfile

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

33
RUN dpkg --add-architecture i386 && \
44
apt-get update && \
@@ -9,7 +9,7 @@ RUN dpkg --add-architecture i386 && \
99
python \
1010
unzip \
1111
expect \
12-
openjdk-9-jre \
12+
openjdk-11-jre \
1313
libstdc++6:i386 \
1414
libpulse0 \
1515
gcc \

‎ci/docker/i686-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:19.04
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
gcc-multilib libc6-dev ca-certificates

‎ci/docker/i686-unknown-linux-musl/Dockerfile

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

33
RUN dpkg --add-architecture i386
44
RUN apt-get update

‎ci/docker/mips-unknown-linux-gnu/Dockerfile

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

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

‎ci/docker/mips-unknown-linux-musl/Dockerfile

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

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates qemu-system-mips curl \

‎ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile

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

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

‎ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile

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

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

‎ci/docker/mipsel-unknown-linux-musl/Dockerfile

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

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates qemu-system-mips curl \

‎ci/docker/powerpc-unknown-linux-gnu/Dockerfile

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

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

‎ci/docker/powerpc64-unknown-linux-gnu/Dockerfile

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

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

‎ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile

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

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

‎ci/docker/s390x-unknown-linux-gnu/Dockerfile

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

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
curl ca-certificates \

‎ci/docker/sparc64-unknown-linux-gnu/Dockerfile

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
FROM debian:stretch
1+
FROM ubuntu:19.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
curl ca-certificates \
55
gcc libc6-dev \
66
gcc-sparc64-linux-gnu libc6-dev-sparc64-cross \
77
qemu-system-sparc64 openbios-sparc seabios ipxe-qemu \
8-
p7zip-full cpio linux-libc-dev-sparc64-cross linux-headers-4.9.0-3-common
9-
10-
# Put linux/module.h into the right spot as it is not shipped by debian
11-
RUN cp /usr/src/linux-headers-4.9.0-3-common/include/uapi/linux/module.h /usr/sparc64-linux-gnu/include/linux/
8+
p7zip-full cpio linux-libc-dev-sparc64-cross
129

1310
COPY linux-sparc64.sh /
1411
RUN bash /linux-sparc64.sh

‎ci/docker/wasm32-unknown-emscripten/Dockerfile

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

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

‎ci/docker/wasm32-unknown-wasi/clang.sh

-2
This file was deleted.

‎ci/docker/wasm32-unknown-wasi/Dockerfile ‎ci/docker/wasm32-wasi/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ RUN mv /clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-18.04 /wasmcc
2828
# those breaking changes on `libc`'s own CI
2929
RUN git clone https://github.com/CraneStation/wasi-sysroot && \
3030
cd wasi-sysroot && \
31-
git reset --hard 2201343c17b7149a75f543f523bea0c3243c6091
31+
git reset --hard eee6ee7566e26f2535eb6088c8494a112ff423b9
3232
RUN make -C wasi-sysroot install -j $(nproc) WASM_CC=/wasmcc/bin/clang INSTALL_DIR=/wasi-sysroot
3333

3434
# This is a small wrapper script which executes the actual clang binary in
3535
# `/wasmcc` and then is sure to pass the right `--sysroot` argument which we
3636
# just built above.
37-
COPY docker/wasm32-unknown-wasi/clang.sh /wasi-sysroot/bin/clang
37+
COPY docker/wasm32-wasi/clang.sh /wasi-sysroot/bin/clang
3838

3939
# In the second container we're going to build the `wasmtime` binary which is
4040
# used to execute wasi executables. This is a standard Rust project so we're
@@ -58,9 +58,9 @@ RUN curl -sSf https://sh.rustup.rs | sh -s -- -y
5858
ENV PATH=/root/.cargo/bin:$PATH
5959

6060
RUN apt-get install -y --no-install-recommends python
61-
RUN git clone https://github.com/CraneStation/wasmtime wasmtime && \
61+
RUN git clone --recursive https://github.com/CraneStation/wasmtime wasmtime && \
6262
cd wasmtime && \
63-
git reset --hard a1c123c3dd8f9766990efe0f1734a646f61ba8a0
63+
git reset --hard 67edb00f29b62864b00179fe4bfa99bc29973285
6464
RUN cargo build --release --manifest-path wasmtime/Cargo.toml
6565

6666
# And finally in the last image we're going to assemble everything together.
@@ -86,8 +86,8 @@ COPY --from=wasmtime /wasmtime/target/release/wasmtime /usr/bin/
8686
# executable with the right sysroot, and then we're sure to turn off the
8787
# crt-static feature to ensure that the CRT that we're specifying with `clang`
8888
# is used.
89-
ENV CARGO_TARGET_WASM32_UNKNOWN_WASI_RUNNER=wasmtime \
90-
CARGO_TARGET_WASM32_UNKNOWN_WASI_LINKER=/wasi-sysroot/bin/clang \
91-
CC_wasm32_unknown_wasi=/wasi-sysroot/bin/clang \
89+
ENV CARGO_TARGET_WASM32_WASI_RUNNER=wasmtime \
90+
CARGO_TARGET_WASM32_WASI_LINKER=/wasi-sysroot/bin/clang \
91+
CC_wasm32_wasi=/wasi-sysroot/bin/clang \
9292
PATH=$PATH:/rust/bin \
9393
RUSTFLAGS=-Ctarget-feature=-crt-static

‎ci/docker/wasm32-wasi/clang.sh

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env sh
2+
exec /wasmcc/bin/clang --target=wasm32-wasi --sysroot /wasi-sysroot "$@"

‎ci/docker/x86_64-linux-android/Dockerfile

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

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

‎ci/docker/x86_64-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:19.04
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
gcc libc6-dev ca-certificates

‎ci/docker/x86_64-unknown-linux-gnux32/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:19.04
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
gcc-multilib libc6-dev ca-certificates

‎ci/docker/x86_64-unknown-linux-musl/Dockerfile

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

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

‎ci/linux-s390x.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ mkdir -m 777 /qemu
66
cd /qemu
77

88
curl --retry 5 -LO https://github.com/qemu/qemu/raw/master/pc-bios/s390-ccw.img
9-
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20170828/images/generic/kernel.debian
10-
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20170828/images/generic/initrd.debian
9+
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20190410/images/generic/kernel.debian
10+
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20190410/images/generic/initrd.debian
1111

1212
mv kernel.debian kernel
1313
mv initrd.debian initrd.gz

‎ci/linux-sparc64.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ set -ex
55
mkdir -m 777 /qemu
66
cd /qemu
77

8-
curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/9.0/sparc64/iso-cd/debian-9.0-sparc64-NETINST-1.iso
9-
7z e debian-9.0-sparc64-NETINST-1.iso boot/initrd.gz
10-
7z e debian-9.0-sparc64-NETINST-1.iso boot/sparc64
8+
curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/10.0/sparc64/iso-cd/debian-10.0-sparc64-NETINST-1.iso
9+
7z e debian-10.0-sparc64-NETINST-1.iso boot/initrd.gz
10+
7z e debian-10.0-sparc64-NETINST-1.iso boot/sparc64
1111
mv sparc64 kernel
12-
rm debian-9.0-sparc64-NETINST-1.iso
12+
rm debian-10.0-sparc64-NETINST-1.iso
1313

1414
mkdir init
1515
cd init

0 commit comments

Comments
 (0)