sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-04 00:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move Ubuntu workflow to qt 6

Browse Source
This commit is contained in:
Nyall Dawson 2025-08-08 08:22:06 +10:00
parent 306cdba12b
commit e49087b258
3 changed files with 61 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
.docker/qgis3-qt5-build-deps.dockerfile → .docker/qgis3-24.10-qt6-build-deps.dockerfile
View File

@ -36,31 +36,31 @@ RUN apt-get update \
'libfcgi0ldbl|libfcgi0t64' \
libgsl28 \
'libprotobuf-lite17|libprotobuf-lite23|libprotobuf-lite32t64' \
libqca-qt5-2-plugins \
libqt53dextras5 \
libqt53drender5 \
'libqt5concurrent5|libqt5concurrent5t64' \
libqt5keychain1 \
libqt5positioning5 \
libqt5multimedia5 \
libqt5multimediawidgets5 \
libqt5qml5 \
libqt5quick5 \
libqt5quickcontrols2-5 \
libqt5quickwidgets5 \
libqt5serialport5 \
libqt5sql5-odbc \
libqt5sql5-sqlite \
'libqt5xml5|libqt5xml5t64' \
libqt5webkit5 \
libqwt-qt5-6 \
libqca-qt6-plugins \
libqt63dextras6 \
libqt63drender6 \
libqt6concurrent6 \
libqt6keychain1 \
libqt6positioning6 \
libqt6multimedia6 \
libqt6multimediawidgets6 \
libqt6qml6 \
libqt6quick6 \
libqt6quickcontrols2-6 \
libqt6quickwidgets6 \
libqt6serialport6 \
libqt6sql6-odbc \
libqt6sql6-sqlite \
libqt6uitools6 \
libqt6xml6 \
libspatialindex7 \
libsqlite3-mod-spatialite \
'libzip4|libzip5|libzip4t64' \
lighttpd \
locales \
poppler-utils \
python3-future \
pyqt6-dev \
pyqt6-dev-tools \
python3-gdal \
python3-mock \
python3-nose2 \
@ -69,23 +69,20 @@ RUN apt-get update \
python3-pip \
python3-psycopg2 \
python3-pyproj \
python3-pyqt5 \
python3-pyqt5.qsci \
python3-pyqt5.qtsql \
python3-pyqt5.qtsvg \
python3-pyqt5.qtwebkit \
python3-pyqt5.qtpositioning \
python3-pyqt5.qtmultimedia \
python3-pyqt5.qtserialport \
python3-sip \
python3-pyqt6 \
python3-pyqt6.qsci \
python3-pyqt6.qtsvg \
python3-pyqt6.qtpositioning \
python3-pyqt6.qtmultimedia \
python3-pyqt6.qtserialport \
python3-termcolor \
python3-yaml \
qpdf \
qt3d-assimpsceneimport-plugin \
qt3d-defaultgeometryloader-plugin \
qt3d-gltfsceneio-plugin \
qt3d-scene2d-plugin \
qt5-image-formats-plugins \
qt6-3d-assimpsceneimport-plugin \
qt6-3d-defaultgeometryloader-plugin \
qt6-3d-gltfsceneio-plugin \
qt6-3d-scene2d-plugin \
qt6-image-formats-plugins \
saga \
supervisor \
unzip \
@ -202,6 +199,7 @@ RUN apt-get update \
clang \
cmake \
flex \
mold \
grass-dev \
libdraco-dev \
libexiv2-dev \
@ -211,13 +209,11 @@ RUN apt-get update \
libgsl-dev \
libpq-dev \
libprotobuf-dev \
libqca-qt5-2-dev \
libqt5opengl5-dev \
libqt5scintilla2-dev \
libqt5svg5-dev \
libqt5webkit5-dev \
libqt5serialport5-dev \
libqwt-qt5-dev \
libqca-qt6-dev \
libqt6opengl6-dev \
libqscintilla2-qt6-dev \
libqt6svg6-dev \
libqt6serialport6-dev \
libspatialindex-dev \
libspatialite-dev \
libsqlite3-dev \
@ -225,21 +221,24 @@ RUN apt-get update \
libzip-dev \
libzstd-dev \
protobuf-compiler \
pyqt5-dev \
pyqt5-dev-tools \
pyqt5.qsci-dev \
pyqt6.qsci-dev \
python3-pyqt6.sip \
python3-all-dev \
python3-dev \
python3-sip-dev \
qt3d5-dev \
qt5keychain-dev \
qtbase5-dev \
qtdeclarative5-dev-tools \
qtpositioning5-dev \
qtmultimedia5-dev \
qttools5-dev \
qttools5-dev-tools \
qtbase5-private-dev \
python3-sipbuild \
python3-pyqtbuild \
sip-tools \
qmake6 \
qt6-3d-dev \
qtkeychain-qt6-dev \
qt6-base-dev \
qt6-declarative-dev-tools \
qt6-positioning-dev \
qt6-multimedia-dev \
qt6-tools-dev \
qt6-tools-dev-tools \
qt6-base-private-dev \
qt6-5compat-dev \
opencl-headers \
ocl-icd-opencl-dev \
&& apt-get clean

0
.docker/qgis3-qt6-build-deps.dockerfile → .docker/qgis3-39-qt6-build-deps.dockerfile
View File

32
.github/workflows/run-tests.yml vendored
View File

@ -43,10 +43,10 @@ jobs:
matrix:
include:
- distro-version: '24.10'
qt-version: 5
qt-version: 6
run-tests: true
with-qt6: OFF
with-qt5: ON
with-qt6: ON
with-qt5: OFF
with-3d: ON
with-quick: ON
with-clazy: ON
@ -143,7 +143,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
file: .docker/qgis3-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}-build-deps.dockerfile
tags: qgis/qgis3-build-deps-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}:${{ github.event.pull_request.base.ref || github.ref_name }}
push: ${{ github.event_name == 'push' && github.repository == 'qgis/QGIS' }}
pull: true
@ -263,33 +263,19 @@ jobs:
strategy:
matrix:
qt-version: [5, 6]
qt-version: [6]
test-batch: [ALL_BUT_PROVIDERS, POSTGRES, HANA, SQLSERVER]
include:
- qt-version: 5
- qt-version: 6
distro-version: '24.10'
docker-target: binary-only
- qt-version: 6
distro-version: 39
docker-target: binary-only
- qt-version: 5
distro-version: '24.10'
test-batch: ORACLE
docker-target: binary-for-oracle
exclude:
- qt-version: 6
test-batch: HANA
- qt-version: 6
test-batch: POSTGRES
- qt-version: 6
test-batch: SQLSERVER
fail-fast: false
steps:
@ -332,8 +318,8 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
file: .docker/qgis3-qt${{ matrix.qt-version }}-build-deps.dockerfile
tags: qgis/qgis3-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }}
file: .docker/qgis3-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}-build-deps.dockerfile
tags: qgis/qgis3-${{ matrix.distro-version }}-qt${{ matrix.qt-version }}-build-deps-bin-only:${{ github.event.pull_request.base.ref || github.ref_name }}
push: ${{ github.event_name == 'push' && github.repository == 'qgis/QGIS' }}
pull: true
target: ${{ matrix.docker-target }}
@ -416,7 +402,7 @@ jobs:
matrix:
include:
- distro-version: '24.10'
qt-version: 5
qt-version: 6
steps:
- name: Free Disk Space (Ubuntu)