Skip to content

Commit

Permalink
lso unify build scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
@3nids
3nids committed Jul 20, 2021
1 parent 0a5f126 commit 790d6f1
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 78 deletions.
46 changes: 0 additions & 46 deletions .docker/docker-qgis-build-qt6.sh
View file

This file was deleted.

31 changes: 17 additions & 14 deletions .docker/docker-qgis-build-qt5.sh → .docker/docker-qgis-build.sh
View file
Expand Up @@ -46,29 +46,32 @@ fi
cmake \
-GNinja \
-DUSE_CCACHE=OFF \
-DWITH_QUICK=ON \
-DWITH_QT6=${WITH_QT6} \
-DWITH_DESKTOP=${WITH_QT5} \
-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_TESTS=${WITH_QT5} \
-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} \
-DORACLE_INCLUDEDIR=/instantclient_19_9/sdk/include/ \
-DORACLE_LIBDIR=/instantclient_19_9/ \
-DDISABLE_DEPRECATED=ON \
Expand Down
3 changes: 0 additions & 3 deletions .docker/docker-variables.env
View file
Expand Up @@ -14,9 +14,6 @@ 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

Expand Down
1 change: 1 addition & 0 deletions .docker/qgis3-qt6-build-deps.dockerfile
View file
Expand Up @@ -3,6 +3,7 @@ MAINTAINER Matthias Kuhn <matthias@opengis.ch>

RUN dnf -y install \
bison \
ccache \
clang \
clazy \
exiv2-devel \
Expand Down
41 changes: 26 additions & 15 deletions .github/workflows/run-tests.yml
View file
Expand Up @@ -40,16 +40,33 @@ jobs:
qt-version: 5
run-tests: true
docker-tag-suffix: ''
with-qt6: OFF
with-qt5: ON
with-3d: ON
with-quick: ON
patch-qt-3d: true

- distro-version: '21.04'
qt-version: 5
run-tests: false
docker-tag-suffix: '_21.04'
docker-tag-suffix: _21.04
with-qt6: OFF
with-qt5: ON
with-3d: OFF
with-quick: ON
patch-qt-3d: false

- 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


fail-fast: false

outputs:
Expand All @@ -72,20 +89,13 @@ jobs:
# Be aware that these instructions are duplicated in run-tests job
DOCKER_TAG=$(echo $( [[ ${GITHUB_EVENT_NAME} =~ ^pull_request$ ]] && echo ${GITHUB_BASE_REF} || echo ${GITHUB_REF##*/} ) | sed 's/^master$/latest/')${{ matrix.docker-tag-suffix }}
CTEST_BUILD_NAME=$( [[ ${GITHUB_EVENT_NAME} =~ ^pull_request$ ]] && echo "PR${GITHUB_PR_NUMBER}" || echo ${GITHUB_REF##*/} )"_${GITHUB_SHA}"
[[ ${UBUNTU_BASE} == "20.04" ]] && PATCH_QT_3D=true || PATCH_QT_3D=false
# build w/o 3D for Qt 5.15 (many deprecation warnings)
[[ ${UBUNTU_BASE} == "21.04" ]] && WITH_3D=FALSE || WITH_3D=TRUE
echo "DOCKER_TAG=${DOCKER_TAG}" >> $GITHUB_ENV
echo "CTEST_BUILD_NAME=${CTEST_BUILD_NAME}" >> $GITHUB_ENV
echo "PATCH_QT_3D=${PATCH_QT_3D}" >> $GITHUB_ENV
echo "WITH_3D=${WITH_3D}" >> $GITHUB_ENV
- name: Print vars
run: |
echo DOCKER_TAG: ${DOCKER_TAG}
echo CTEST_BUILD_NAME: ${CTEST_BUILD_NAME}
echo PATCH_QT_3D: ${PATCH_QT_3D}
echo WITH_3D: ${WITH_3D}
- name: Build Docker Container with Build Environment
id: docker-build
Expand Down Expand Up @@ -147,9 +157,14 @@ jobs:
-v /home/runner/QGIS/.ccache:/root/.ccache \
--env-file .docker/docker-variables.env \
--env PUSH_TO_CDASH=true \
--env WITH_3D=${WITH_3D} \
--env WITH_DESKTOP=${ matrix.with-desktop} \
--env WITH_QT6=${ matrix.with-qt6} \
--env WITH_QUICK=${ matrix.with-quick} \
--env WITH_3D=${ matrix.with-3d} \
--env WITH_BINDINGS=${ matrix.with-bindings} \
--env PATCH_QT_3D=${ matrix.patch-qt-3d} \
qgis3-build-deps \
/root/QGIS/.docker/docker-qgis-build-qt${{ matrix.qt-version }}.sh
/root/QGIS/.docker/docker-qgis-build.sh
- name: Push artifact
id: push_artifact
Expand Down Expand Up @@ -302,18 +317,14 @@ jobs:
# Be aware that these instructions are duplicated in build job
DOCKER_TAG=$(echo $( [[ ${GITHUB_EVENT_NAME} =~ ^pull_request$ ]] && echo ${GITHUB_BASE_REF} || echo ${GITHUB_REF##*/} ) | sed 's/^master$/latest/')${{ matrix.docker-tag-suffix }}
CTEST_BUILD_NAME=$( [[ ${GITHUB_EVENT_NAME} =~ ^pull_request$ ]] && echo "PR${GITHUB_PR_NUMBER}" || echo ${GITHUB_REF##*/} )"_${GITHUB_SHA}_${TEST_BATCH}"
[[ ${UBUNTU_BASE} == "20.04" ]] && PATCH_QT_3D=true || PATCH_QT_3D=false
echo "DOCKER_TAG=${DOCKER_TAG}" >> $GITHUB_ENV
echo "CTEST_BUILD_NAME=${CTEST_BUILD_NAME}" >> $GITHUB_ENV
echo "PATCH_QT_3D=${PATCH_QT_3D}" >> $GITHUB_ENV
echo "TEST_BATCH=${TEST_BATCH}" >> $GITHUB_ENV
- name: Print vars
run: |
echo DOCKER_TAG: ${DOCKER_TAG}
echo CTEST_BUILD_NAME: ${CTEST_BUILD_NAME}
echo PATCH_QT_3D: ${PATCH_QT_3D}
echo TEST_BATCH: ${TEST_BATCH}
- name: Build deps
env:
Expand Down

0 comments on commit 790d6f1

Please sign in to comment.