Skip to content
Permalink
Browse files
build with Qt6 on CI
  • Loading branch information
3nids committed Aug 17, 2021
1 parent 930df73 commit fd5976bed7b6f9acf846928611e4c1365d058a81
Showing with 23 additions and 20 deletions.
  1. +2 −2 .docker/docker-qgis-build.sh
  2. +10 −7 .docker/qgis3-qt6-build-deps.dockerfile
  3. +11 −11 .github/workflows/run-tests.yml
@@ -57,7 +57,7 @@ cmake \
-DUSE_CCACHE=OFF \
-DWITH_QT6=${WITH_QT6} \
-DWITH_DESKTOP=${WITH_QT5} \
-DWITH_ANALYSIS=ON \
-DWITH_ANALYSIS=${WITH_QT5} \
-DWITH_GUI=${WITH_QT5} \
-DWITH_QUICK=${WITH_QUICK} \
-DWITH_3D=${WITH_3D} \
@@ -73,7 +73,7 @@ cmake \
-DENABLE_ORACLETEST=${WITH_QT5} \
-DPUSH_TO_CDASH=${PUSH_TO_CDASH} \
-DWITH_HANA=${WITH_QT5} \
-DWITH_QGIS_PROCESS=ON \
-DWITH_QGIS_PROCESS=${WITH_QT5} \
-DWITH_QSPATIALITE=${WITH_QT5} \
-DWITH_QWTPOLAR=OFF \
-DWITH_APIDOC=OFF \
@@ -1,4 +1,4 @@
FROM fedora:rawhide as single
FROM fedora:34 as single
MAINTAINER Matthias Kuhn <matthias@opengis.ch>

RUN dnf -y install \
@@ -45,18 +45,20 @@ RUN dnf -y install \
ninja-build

RUN cd /usr/src \
&& wget https://github.com/KDE/qca/archive/refs/tags/v2.3.3.zip \
&& unzip v2.3.3.zip \
&& mkdir build-qt6 \
&& cd build-qt6 \
&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DQT6=ON -GNinja ../qca-2.3.3 \
&& wget https://github.com/KDE/qca/archive/refs/heads/master.zip \
&& unzip master.zip \
&& rm master.zip \
&& mkdir build \
&& cd build \
&& cmake -DQT6=ON -GNinja -DCMAKE_INSTALL_PREFIX=/usr/local ../qca-master \
&& ninja install

RUN cd /usr/src \
&& wget https://github.com/frankosterfeld/qtkeychain/archive/refs/heads/master.zip \
&& unzip master.zip \
&& rm master.zip \
&& cd qtkeychain-master \
&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WITH_QT6=ON -GNinja \
&& cmake -DBUILD_WITH_QT6=ON -DCMAKE_INSTALL_PREFIX=/usr/local -GNinja \
&& ninja install

RUN cd /usr/src \
@@ -66,3 +68,4 @@ RUN cd /usr/src \
&& qmake6 qwt.pro \
&& make -j4 \
&& make install

@@ -58,16 +58,16 @@ jobs:
patch-qt-3d: false
LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so

# - distro-version: 'rawhide'
# qt-version: 6
# run-tests: false
# docker-tag-suffix: ''
# with-qt6: ON
# with-qt5: OFF
# with-3d: OFF
# with-quick: OFF
# patch-qt-3d: false
# LD_PRELOAD: ''
- distro-version: '34'
qt-version: 6
run-tests: false
docker-tag-suffix: ''
with-qt6: ON
with-qt5: OFF
with-3d: OFF
with-quick: OFF
patch-qt-3d: false
LD_PRELOAD: ''


fail-fast: false
@@ -298,7 +298,7 @@ jobs:
test-batch: ORACLE
docker-target: binary-for-oracle

# - distro-version: rawhide
# - distro-version: '34'
# qt-version: 6
# test-batch: ALL_BUT_PROVIDERS
# docker-target: single

0 comments on commit fd5976b

Please sign in to comment.