Skip to content
Permalink
Browse files
use single workflows for all Qt versions (#44241)
* use single workflows for all Qt versions

* simplify variables

* fix workflow

* fix file path

* lso unify build scripts

* Fix var name

* fix workflow var

* fix ccache lib path on fedora

* restore clang warnings for Qt6

* do not defined LD_PRELOAD for fedora

* try without locale

* always enable tests

* no serial port

* disable webkit

* disable oauth

* with analysis

* fix Dockerfile path

* replace locale for testing images only
  • Loading branch information
3nids committed Jul 21, 2021
2 parents deb516d + 70f2c4b commit a80e42be1656321e62d92721c6c6f8826841c991
@@ -20,3 +20,6 @@ services:
- oracle
env_file:
- docker-variables.env
environment:
- LANG=C.UTF-8
- LC_ALL=en_US.UTF-8
@@ -20,5 +20,8 @@ services:
- postgres
env_file:
- docker-variables.env
environment:
- LANG=C.UTF-8
- LC_ALL=en_US.UTF-8
cap_add:
- NET_ADMIN
@@ -17,3 +17,7 @@ services:
# - mssql
env_file:
- docker-variables.env
environment:
- LANG=C.UTF-8
- LC_ALL=en_US.UTF-8

This file was deleted.

@@ -30,8 +30,17 @@ pushd build > /dev/null
echo "${bold}Running cmake...${endbold}"
echo "::group::cmake"

export CC=/usr/lib/ccache/clang
export CXX=/usr/lib/ccache/clang++
if [[ -f "/usr/lib64/ccache/clang" ]]; then
export CC=/usr/lib64/ccache/clang
export CXX=/usr/lib64/ccache/clang++
else
export CC=/usr/lib/ccache/clang
export CXX=/usr/lib/ccache/clang++
fi

if [[ ${WITH_QT6} = "ON" ]]; then
CLANG_WARNINGS="-Wrange-loop-construct"
fi

CMAKE_EXTRA_ARGS=()
if [[ ${PATCH_QT_3D} == "true" ]]; then
@@ -46,29 +55,36 @@ fi
cmake \
-GNinja \
-DUSE_CCACHE=OFF \
-DWITH_QUICK=ON \
-DWITH_QT6=${WITH_QT6} \
-DWITH_DESKTOP=${WITH_QT5} \
-DWITH_ANALYSIS=ON \
-DWITH_GUI=${WITH_QT5} \
-DWITH_QUICK=${WITH_QUICK} \
-DWITH_3D=${WITH_3D} \
-DWITH_STAGED_PLUGINS=ON \
-DWITH_GRASS=OFF \
-DSUPPRESS_QT_WARNINGS=ON \
-DENABLE_TESTS=ON \
-DENABLE_MODELTEST=ON \
-DENABLE_PGTEST=ON \
-DENABLE_SAGA_TESTS=ON \
-DENABLE_MSSQLTEST=ON \
-DENABLE_MODELTEST=${WITH_QT5} \
-DENABLE_PGTEST=${WITH_QT5} \
-DENABLE_SAGA_TESTS=${WITH_QT5} \
-DENABLE_MSSQLTEST=${WITH_QT5} \
-DENABLE_HANATEST=${HANA_TESTS_ENABLED} \
-DENABLE_ORACLETEST=ON \
-DENABLE_ORACLETEST=${WITH_QT5} \
-DPUSH_TO_CDASH=${PUSH_TO_CDASH} \
-DWITH_HANA=ON \
-DWITH_QSPATIALITE=ON \
-DWITH_HANA=${WITH_QT5} \
-DWITH_QGIS_PROCESS=${WITH_QT5} \
-DWITH_QSPATIALITE=${WITH_QT5} \
-DWITH_QWTPOLAR=OFF \
-DWITH_APIDOC=OFF \
-DWITH_ASTYLE=OFF \
-DWITH_DESKTOP=ON \
-DWITH_BINDINGS=ON \
-DWITH_SERVER=ON \
-DWITH_ORACLE=ON \
-DWITH_PDAL=ON \
-DWITH_BINDINGS=${WITH_QT5} \
-DWITH_SERVER=${WITH_QT5} \
-DWITH_ORACLE=${WITH_QT5} \
-DWITH_PDAL=${WITH_QT5} \
-DWITH_QT5SERIALPORT=${WITH_QT5} \
-DWITH_QTWEBKIT=${WITH_QT5} \
-DWITH_OAUTH2_PLUGIN=${WITH_QT5} \
-DORACLE_INCLUDEDIR=/instantclient_19_9/sdk/include/ \
-DORACLE_LIBDIR=/instantclient_19_9/ \
-DDISABLE_DEPRECATED=ON \
@@ -1,6 +1,5 @@

# CTEST
LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
SEGFAULT_SIGNALS="abrt segv"
CTEST_BUILD_COMMAND=/usr/bin/ninja
CTEST_PARALLEL_LEVEL=1
@@ -14,15 +13,9 @@ RUN_FLAKY_TESTS
QGIS_NO_OVERRIDE_IMPORT=1
HANA_TESTS_ENABLED=ON

# Defined in workflow
PATCH_QT_3D

# This is used in some tests to be skipped
QGIS_CONTINUOUS_INTEGRATION_RUN=true

LANG=C.UTF-8
LC_ALL=en_US.UTF-8

PUSH_TO_CDASH=false

XDG_RUNTIME_DIR=/tmp
@@ -1,9 +1,9 @@

ARG UBUNTU_BASE=20.04
ARG DISTRO_VERSION=20.04

# Oracle Docker image is too large, so we add as less dependencies as possible
# so there is enough space on GitHub runner
FROM ubuntu:${UBUNTU_BASE} as binary-for-oracle
FROM ubuntu:${DISTRO_VERSION} as binary-for-oracle
MAINTAINER Denis Rouzaud <denis@opengis.ch>

LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
@@ -3,6 +3,7 @@ MAINTAINER Matthias Kuhn <matthias@opengis.ch>

RUN dnf -y install \
bison \
ccache \
clang \
clazy \
exiv2-devel \

This file was deleted.

0 comments on commit a80e42b

Please sign in to comment.