mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #100935 - cuviper:upgrade-android-ci, r=Mark-Simulacrum

Browse Source 
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.
This commit is contained in:
bors 2022-09-02 05:32:57 +00:00
commit b10aed0084
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ci/docker/host-x86_64/arm-android/Dockerfile
View File

@ -1,5 +1,6 @@
FROM ubuntu:16.04 FROM ubuntu:22.04
ARG DEBIAN_FRONTEND=noninteractive
COPY scripts/android-base-apt-get.sh /scripts/ COPY scripts/android-base-apt-get.sh /scripts/
RUN sh /scripts/android-base-apt-get.sh RUN sh /scripts/android-base-apt-get.sh
@ -13,7 +14,7 @@ RUN dpkg --add-architecture i386 && \
libgl1-mesa-glx \ libgl1-mesa-glx \
libpulse0 \ libpulse0 \
libstdc++6:i386 \ libstdc++6:i386 \
openjdk-9-jre-headless \ openjdk-8-jre-headless \
tzdata \ tzdata \
wget \ wget \
python3 python3
@ -29,20 +30,12 @@ ENV PATH=$PATH:/android/sdk/platform-tools
ENV TARGETS=arm-linux-androideabi ENV TARGETS=arm-linux-androideabi
# We are intentionally allowing an old toolchain on this builder (and that's ENV RUST_CONFIGURE_ARGS --arm-linux-androideabi-ndk=/android/ndk/arm-14
# 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 SCRIPT python3 ../x.py --stage 2 test --host='' --target $TARGETS ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target $TARGETS
COPY scripts/sccache.sh /scripts/ COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh RUN sh /scripts/sccache.sh
COPY scripts/cmake.sh /scripts/
RUN /scripts/cmake.sh
COPY scripts/android-start-emulator.sh /scripts/ COPY scripts/android-start-emulator.sh /scripts/
ENTRYPOINT ["/scripts/android-start-emulator.sh"] ENTRYPOINT ["/scripts/android-start-emulator.sh"]

8
src/ci/docker/host-x86_64/dist-android/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:22.04
COPY scripts/android-base-apt-get.sh /scripts/ COPY scripts/android-base-apt-get.sh /scripts/
RUN sh /scripts/android-base-apt-get.sh RUN sh /scripts/android-base-apt-get.sh
@ -32,13 +32,9 @@ ENV RUST_CONFIGURE_ARGS \
--i686-linux-android-ndk=/android/ndk/x86-14 \ --i686-linux-android-ndk=/android/ndk/x86-14 \
--aarch64-linux-android-ndk=/android/ndk/arm64-21 \ --aarch64-linux-android-ndk=/android/ndk/arm64-21 \
--x86_64-linux-android-ndk=/android/ndk/x86_64-21 \ --x86_64-linux-android-ndk=/android/ndk/x86_64-21 \
--disable-docs \ --disable-docs
--set llvm.allow-old-toolchain
ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS
COPY scripts/sccache.sh /scripts/ COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh RUN sh /scripts/sccache.sh
COPY scripts/cmake.sh /scripts/
RUN /scripts/cmake.sh

1
src/ci/docker/scripts/android-base-apt-get.sh
View File

@ -10,6 +10,7 @@ apt-get install -y --no-install-recommends \
g++ \ g++ \
git \ git \
libssl-dev \ libssl-dev \
libncurses5 \
make \ make \
ninja-build \ ninja-build \
pkg-config \ pkg-config \