Skip to content

Commit 4ac8346

Browse files
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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 \

0 commit comments

Comments
 (0)