Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: upgrade to ubuntu 24.04 #59797

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CI: upgrade to ubuntu 24.04 #59797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions .docker/qgis3-qt5-build-deps.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
# so there is enough space on GitHub runner
Expand All @@ -14,6 +14,7 @@ LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Ve

RUN apt-get update \
&& apt-get install -y software-properties-common \
&& add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
apt-transport-https \
Expand All @@ -27,16 +28,16 @@ RUN apt-get update \
gnupg \
gpsbabel \
graphviz \
libaio1 \
libdraco4 \
'libaio1|libaio1t64' \
'libdraco4|libdraco8' \
libexiv2-27 \
libfcgi0ldbl \
'libfcgi0ldbl|libfcgi0t64' \
libgsl27 \
'libprotobuf-lite17|libprotobuf-lite23' \
'libprotobuf-lite17|libprotobuf-lite23|libprotobuf-lite32t64' \
libqca-qt5-2-plugins \
libqt53dextras5 \
libqt53drender5 \
libqt5concurrent5 \
'libqt5concurrent5|libqt5concurrent5t64' \
libqt5keychain1 \
libqt5positioning5 \
libqt5multimedia5 \
Expand All @@ -48,12 +49,12 @@ RUN apt-get update \
libqt5serialport5 \
libqt5sql5-odbc \
libqt5sql5-sqlite \
libqt5xml5 \
'libqt5xml5|libqt5xml5t64' \
libqt5webkit5 \
libqwt-qt5-6 \
libspatialindex6 \
libsqlite3-mod-spatialite \
'libzip4|libzip5' \
'libzip4|libzip5|libzip4t64' \
lighttpd \
locales \
pdal \
Expand All @@ -62,6 +63,7 @@ RUN apt-get update \
python3-gdal \
python3-mock \
python3-nose2 \
python3-numpy \
python3-owslib \
python3-pip \
python3-psycopg2 \
Expand Down Expand Up @@ -93,7 +95,7 @@ RUN apt-get update \
xfonts-scalable \
xvfb \
ocl-icd-libopencl1 \
&& pip3 install \
&& pip3 install --break-system-packages \
numpy \
nose2 \
pyyaml \
Expand Down Expand Up @@ -148,7 +150,7 @@ RUN apt-get update \
iproute2 \
postgresql-client \
spawn-fcgi \
&& pip3 install \
&& pip3 install --break-system-packages \
psycopg2 \
&& apt-get clean

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
strategy:
matrix:
include:
- distro-version: '22.04'
- distro-version: '24.04'
qt-version: 5
run-tests: true
with-qt6: OFF
Expand Down Expand Up @@ -247,15 +247,15 @@ jobs:

include:
- qt-version: 5
distro-version: 22.04
distro-version: 24.04
docker-target: binary-only

- qt-version: 6
distro-version: 39
docker-target: binary-only

- qt-version: 5
distro-version: 22.04
distro-version: 24.04
test-batch: ORACLE
docker-target: binary-for-oracle

Expand Down Expand Up @@ -390,7 +390,7 @@ jobs:
strategy:
matrix:
include:
- distro-version: '22.04'
- distro-version: '24.04'
qt-version: 5

steps:
Expand Down
Loading