CI: upgrade to ubuntu 24.04

This commit is contained in:
t0b3 2024-12-09 23:19:56 +01:00 committed by Nyall Dawson
parent 4cd8298321
commit 443513504b
2 changed files with 16 additions and 14 deletions

View File

@ -1,5 +1,5 @@
ARG DISTRO_VERSION=22.04 ARG DISTRO_VERSION=24.04
# Oracle Docker image is too large, so we add as less dependencies as possible # Oracle Docker image is too large, so we add as less dependencies as possible
# so there is enough space on GitHub runner # so there is enough space on GitHub runner
@ -14,6 +14,7 @@ LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Ve
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y software-properties-common \ && apt-get install -y software-properties-common \
&& add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable \
&& apt-get update \ && apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
apt-transport-https \ apt-transport-https \
@ -27,16 +28,16 @@ RUN apt-get update \
gnupg \ gnupg \
gpsbabel \ gpsbabel \
graphviz \ graphviz \
libaio1 \ 'libaio1|libaio1t64' \
libdraco4 \ 'libdraco4|libdraco8' \
libexiv2-27 \ libexiv2-27 \
libfcgi0ldbl \ 'libfcgi0ldbl|libfcgi0t64' \
libgsl27 \ libgsl27 \
'libprotobuf-lite17|libprotobuf-lite23' \ 'libprotobuf-lite17|libprotobuf-lite23|libprotobuf-lite32t64' \
libqca-qt5-2-plugins \ libqca-qt5-2-plugins \
libqt53dextras5 \ libqt53dextras5 \
libqt53drender5 \ libqt53drender5 \
libqt5concurrent5 \ 'libqt5concurrent5|libqt5concurrent5t64' \
libqt5keychain1 \ libqt5keychain1 \
libqt5positioning5 \ libqt5positioning5 \
libqt5multimedia5 \ libqt5multimedia5 \
@ -48,12 +49,12 @@ RUN apt-get update \
libqt5serialport5 \ libqt5serialport5 \
libqt5sql5-odbc \ libqt5sql5-odbc \
libqt5sql5-sqlite \ libqt5sql5-sqlite \
libqt5xml5 \ 'libqt5xml5|libqt5xml5t64' \
libqt5webkit5 \ libqt5webkit5 \
libqwt-qt5-6 \ libqwt-qt5-6 \
libspatialindex6 \ libspatialindex6 \
libsqlite3-mod-spatialite \ libsqlite3-mod-spatialite \
'libzip4|libzip5' \ 'libzip4|libzip5|libzip4t64' \
lighttpd \ lighttpd \
locales \ locales \
pdal \ pdal \
@ -62,6 +63,7 @@ RUN apt-get update \
python3-gdal \ python3-gdal \
python3-mock \ python3-mock \
python3-nose2 \ python3-nose2 \
python3-numpy \
python3-owslib \ python3-owslib \
python3-pip \ python3-pip \
python3-psycopg2 \ python3-psycopg2 \
@ -93,7 +95,7 @@ RUN apt-get update \
xfonts-scalable \ xfonts-scalable \
xvfb \ xvfb \
ocl-icd-libopencl1 \ ocl-icd-libopencl1 \
&& pip3 install \ && pip3 install --break-system-packages \
numpy \ numpy \
nose2 \ nose2 \
pyyaml \ pyyaml \
@ -148,7 +150,7 @@ RUN apt-get update \
iproute2 \ iproute2 \
postgresql-client \ postgresql-client \
spawn-fcgi \ spawn-fcgi \
&& pip3 install \ && pip3 install --break-system-packages \
psycopg2 \ psycopg2 \
&& apt-get clean && apt-get clean

View File

@ -42,7 +42,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- distro-version: '22.04' - distro-version: '24.04'
qt-version: 5 qt-version: 5
run-tests: true run-tests: true
with-qt6: OFF with-qt6: OFF
@ -247,7 +247,7 @@ jobs:
include: include:
- qt-version: 5 - qt-version: 5
distro-version: 22.04 distro-version: 24.04
docker-target: binary-only docker-target: binary-only
- qt-version: 6 - qt-version: 6
@ -255,7 +255,7 @@ jobs:
docker-target: binary-only docker-target: binary-only
- qt-version: 5 - qt-version: 5
distro-version: 22.04 distro-version: 24.04
test-batch: ORACLE test-batch: ORACLE
docker-target: binary-for-oracle docker-target: binary-for-oracle
@ -390,7 +390,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- distro-version: '22.04' - distro-version: '24.04'
qt-version: 5 qt-version: 5
steps: steps: