Skip to content

Commit 4435135

Browse files
t0b3nyalldawson
authored andcommitted
CI: upgrade to ubuntu 24.04
1 parent 4cd8298 commit 4435135

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

.docker/qgis3-qt5-build-deps.dockerfile

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
ARG DISTRO_VERSION=22.04
2+
ARG DISTRO_VERSION=24.04
33

44
# Oracle Docker image is too large, so we add as less dependencies as possible
55
# so there is enough space on GitHub runner
@@ -14,6 +14,7 @@ LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Ve
1414

1515
RUN apt-get update \
1616
&& apt-get install -y software-properties-common \
17+
&& add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable \
1718
&& apt-get update \
1819
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
1920
apt-transport-https \
@@ -27,16 +28,16 @@ RUN apt-get update \
2728
gnupg \
2829
gpsbabel \
2930
graphviz \
30-
libaio1 \
31-
libdraco4 \
31+
'libaio1|libaio1t64' \
32+
'libdraco4|libdraco8' \
3233
libexiv2-27 \
33-
libfcgi0ldbl \
34+
'libfcgi0ldbl|libfcgi0t64' \
3435
libgsl27 \
35-
'libprotobuf-lite17|libprotobuf-lite23' \
36+
'libprotobuf-lite17|libprotobuf-lite23|libprotobuf-lite32t64' \
3637
libqca-qt5-2-plugins \
3738
libqt53dextras5 \
3839
libqt53drender5 \
39-
libqt5concurrent5 \
40+
'libqt5concurrent5|libqt5concurrent5t64' \
4041
libqt5keychain1 \
4142
libqt5positioning5 \
4243
libqt5multimedia5 \
@@ -48,12 +49,12 @@ RUN apt-get update \
4849
libqt5serialport5 \
4950
libqt5sql5-odbc \
5051
libqt5sql5-sqlite \
51-
libqt5xml5 \
52+
'libqt5xml5|libqt5xml5t64' \
5253
libqt5webkit5 \
5354
libqwt-qt5-6 \
5455
libspatialindex6 \
5556
libsqlite3-mod-spatialite \
56-
'libzip4|libzip5' \
57+
'libzip4|libzip5|libzip4t64' \
5758
lighttpd \
5859
locales \
5960
pdal \
@@ -62,6 +63,7 @@ RUN apt-get update \
6263
python3-gdal \
6364
python3-mock \
6465
python3-nose2 \
66+
python3-numpy \
6567
python3-owslib \
6668
python3-pip \
6769
python3-psycopg2 \
@@ -93,7 +95,7 @@ RUN apt-get update \
9395
xfonts-scalable \
9496
xvfb \
9597
ocl-icd-libopencl1 \
96-
&& pip3 install \
98+
&& pip3 install --break-system-packages \
9799
numpy \
98100
nose2 \
99101
pyyaml \
@@ -148,7 +150,7 @@ RUN apt-get update \
148150
iproute2 \
149151
postgresql-client \
150152
spawn-fcgi \
151-
&& pip3 install \
153+
&& pip3 install --break-system-packages \
152154
psycopg2 \
153155
&& apt-get clean
154156

.github/workflows/run-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
strategy:
4343
matrix:
4444
include:
45-
- distro-version: '22.04'
45+
- distro-version: '24.04'
4646
qt-version: 5
4747
run-tests: true
4848
with-qt6: OFF
@@ -247,15 +247,15 @@ jobs:
247247

248248
include:
249249
- qt-version: 5
250-
distro-version: 22.04
250+
distro-version: 24.04
251251
docker-target: binary-only
252252

253253
- qt-version: 6
254254
distro-version: 39
255255
docker-target: binary-only
256256

257257
- qt-version: 5
258-
distro-version: 22.04
258+
distro-version: 24.04
259259
test-batch: ORACLE
260260
docker-target: binary-for-oracle
261261

@@ -390,7 +390,7 @@ jobs:
390390
strategy:
391391
matrix:
392392
include:
393-
- distro-version: '22.04'
393+
- distro-version: '24.04'
394394
qt-version: 5
395395

396396
steps:

0 commit comments

Comments
 (0)