Skip to content

Commit 1555074

Browse files
committed
Auto merge of rust-lang#133532 - rami3l:ci/bump-ubuntu, r=Kobzol
Bump unsupported `ubuntu` CI images to 24.04 LTS Closes rust-lang#133531. try-job: arm-android try-job: dist-android try-job: dist-ohos
2 parents ca4e54f + cddc831 commit 1555074

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/ci/docker/host-x86_64/arm-android/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:23.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44
COPY scripts/android-base-apt-get.sh /scripts/
@@ -11,7 +11,8 @@ RUN . /scripts/android-ndk.sh && \
1111
RUN dpkg --add-architecture i386 && \
1212
apt-get update && \
1313
apt-get install -y --no-install-recommends \
14-
libgl1-mesa-glx \
14+
libgl1 \
15+
libglx-mesa0 \
1516
libpulse0 \
1617
libstdc++6:i386 \
1718
openjdk-8-jre-headless \

src/ci/docker/host-x86_64/dist-android/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:23.04
1+
FROM ubuntu:24.04
22

33
COPY scripts/android-base-apt-get.sh /scripts/
44
RUN sh /scripts/android-base-apt-get.sh

src/ci/docker/host-x86_64/dist-ohos/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:23.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44
RUN apt-get update && apt-get install -y --no-install-recommends \

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apt-get install -y --no-install-recommends \
1010
g++ \
1111
git \
1212
libssl-dev \
13-
libncurses5 \
13+
libncurses-dev \
1414
make \
1515
ninja-build \
1616
pkg-config \

0 commit comments

Comments
 (0)