diff options
| author | bors <bors@rust-lang.org> | 2022-09-02 05:32:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-02 05:32:57 +0000 |
| commit | b10aed0084e3fb32b365dba06a1b644c3b0f438b (patch) | |
| tree | 2c07f6779095b1815236e3236a3dd189ef225388 | |
| parent | 301348077d364d536d5f7cb57a72b85d9966ded6 (diff) | |
| parent | 9e5bc44be45b53e71af45d66613d2fdb62f4d523 (diff) | |
| download | rust-b10aed0084e3fb32b365dba06a1b644c3b0f438b.tar.gz rust-b10aed0084e3fb32b365dba06a1b644c3b0f438b.zip | |
Auto merge of #100935 - cuviper:upgrade-android-ci, r=Mark-Simulacrum
ci: Upgrade android containers from ubuntu:16.04 to 22.04 The main goal of updating to 22.04 is to get away from `llvm.allow-old-toolchain`. These containers are not building LLVM for android, so only the host version matters. A side benefit is that they can also use the system `cmake` instead of building one.
| -rw-r--r-- | src/ci/docker/host-x86_64/arm-android/Dockerfile | 15 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-android/Dockerfile | 8 | ||||
| -rw-r--r-- | src/ci/docker/scripts/android-base-apt-get.sh | 1 |
3 files changed, 7 insertions, 17 deletions
diff --git a/src/ci/docker/host-x86_64/arm-android/Dockerfile b/src/ci/docker/host-x86_64/arm-android/Dockerfile index d0d367b39b4..7a875c960e1 100644 --- a/src/ci/docker/host-x86_64/arm-android/Dockerfile +++ b/src/ci/docker/host-x86_64/arm-android/Dockerfile @@ -1,5 +1,6 @@ -FROM ubuntu:16.04 +FROM ubuntu:22.04 +ARG DEBIAN_FRONTEND=noninteractive COPY scripts/android-base-apt-get.sh /scripts/ RUN sh /scripts/android-base-apt-get.sh @@ -13,7 +14,7 @@ RUN dpkg --add-architecture i386 && \ libgl1-mesa-glx \ libpulse0 \ libstdc++6:i386 \ - openjdk-9-jre-headless \ + openjdk-8-jre-headless \ tzdata \ wget \ python3 @@ -29,20 +30,12 @@ ENV PATH=$PATH:/android/sdk/platform-tools ENV TARGETS=arm-linux-androideabi -# We are intentionally allowing an old toolchain on this builder (and that's -# incompatible with LLVM downloads today). -ENV NO_DOWNLOAD_CI_LLVM 1 - -ENV RUST_CONFIGURE_ARGS --arm-linux-androideabi-ndk=/android/ndk/arm-14 \ - --set llvm.allow-old-toolchain +ENV RUST_CONFIGURE_ARGS --arm-linux-androideabi-ndk=/android/ndk/arm-14 ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target $TARGETS COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -COPY scripts/cmake.sh /scripts/ -RUN /scripts/cmake.sh - COPY scripts/android-start-emulator.sh /scripts/ ENTRYPOINT ["/scripts/android-start-emulator.sh"] diff --git a/src/ci/docker/host-x86_64/dist-android/Dockerfile b/src/ci/docker/host-x86_64/dist-android/Dockerfile index c98fa496d48..2328db4ab8b 100644 --- a/src/ci/docker/host-x86_64/dist-android/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-android/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:22.04 COPY scripts/android-base-apt-get.sh /scripts/ RUN sh /scripts/android-base-apt-get.sh @@ -32,13 +32,9 @@ ENV RUST_CONFIGURE_ARGS \ --i686-linux-android-ndk=/android/ndk/x86-14 \ --aarch64-linux-android-ndk=/android/ndk/arm64-21 \ --x86_64-linux-android-ndk=/android/ndk/x86_64-21 \ - --disable-docs \ - --set llvm.allow-old-toolchain + --disable-docs ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh - -COPY scripts/cmake.sh /scripts/ -RUN /scripts/cmake.sh diff --git a/src/ci/docker/scripts/android-base-apt-get.sh b/src/ci/docker/scripts/android-base-apt-get.sh index f1761f80643..22e2e243e43 100644 --- a/src/ci/docker/scripts/android-base-apt-get.sh +++ b/src/ci/docker/scripts/android-base-apt-get.sh @@ -10,6 +10,7 @@ apt-get install -y --no-install-recommends \ g++ \ git \ libssl-dev \ + libncurses5 \ make \ ninja-build \ pkg-config \ |