Auto merge of #133532 - rami3l:ci/bump-ubuntu, r=Kobzol

Bump unsupported `ubuntu` CI images to 24.04 LTS

Closes #133531.

try-job: arm-android
try-job: dist-android
try-job: dist-ohos
This commit is contained in:
bors 2024-12-01 16:57:16 +00:00
commit 1555074ca9
4 changed files with 6 additions and 5 deletions

View file

@ -1,4 +1,4 @@
FROM ubuntu:23.04
FROM ubuntu:24.04
ARG DEBIAN_FRONTEND=noninteractive
COPY scripts/android-base-apt-get.sh /scripts/
@ -11,7 +11,8 @@ RUN . /scripts/android-ndk.sh && \
RUN dpkg --add-architecture i386 && \
apt-get update && \
apt-get install -y --no-install-recommends \
libgl1-mesa-glx \
libgl1 \
libglx-mesa0 \
libpulse0 \
libstdc++6:i386 \
openjdk-8-jre-headless \

View file

@ -1,4 +1,4 @@
FROM ubuntu:23.04
FROM ubuntu:24.04
COPY scripts/android-base-apt-get.sh /scripts/
RUN sh /scripts/android-base-apt-get.sh

View file

@ -1,4 +1,4 @@
FROM ubuntu:23.04
FROM ubuntu:24.04
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \

View file

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