Skip to content
Permalink
Browse files

Tune build with Qt 5.14

  • Loading branch information
m-kuhn committed Sep 20, 2020
1 parent 640f046 commit 724746c27c911830ebfe1e42d3d281c40e72b667
Showing with 8 additions and 18 deletions.
  1. +0 −1 .ci/qt5_14/Dockerfile
  2. +3 −8 .ci/qt5_14/build.sh
  3. +5 −9 .github/workflows/qt5_14.yml
@@ -3,7 +3,6 @@ MAINTAINER Matthias Kuhn <matthias@opengis.ch>

RUN dnf -y install \
bison \
ccache \
clang \
clazy \
exiv2-devel \
@@ -3,10 +3,7 @@
mkdir /usr/src/qgis/build
cd /usr/src/qgis/build || exit -1

ccache -s

ln -s /../../bin/ccache /usr/lib64/ccache/clang
ln -s /../../bin/ccache /usr/lib64/ccache/clang++
CLANG_WARNINGS="-Wall"

cmake -GNinja \
-DWITH_QUICK=OFF \
@@ -28,12 +25,10 @@ cmake -GNinja \
-DWITH_ORACLE=OFF \
-DDISABLE_DEPRECATED=ON \
-DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
-DCMAKE_C_COMPILER=/usr/lib64/ccache/clang \
-DCMAKE_CXX_COMPILER=/usr/lib64/ccache/clang++ \
-DCMAKE_C_COMPILER=/bin/clang \
-DCMAKE_CXX_COMPILER=/bin/clang++ \
-DADD_CLAZY_CHECKS=ON \
-DWERROR=TRUE \
..

ninja

ccache -s
@@ -9,6 +9,8 @@ on:
- 'src/**'
- 'tests/**'
- 'CMakeLists.txt'
- '.github/workflows/**'
- '.ci/**'
pull_request:
branches:
- master
@@ -17,6 +19,8 @@ on:
- 'src/**'
- 'tests/**'
- 'CMakeLists.txt'
- '.github/workflows/**'
- '.ci/**'

jobs:
build:
@@ -29,14 +33,6 @@ jobs:
run: |
docker build -t qgis_build_deps -f .ci/qt5_14/Dockerfile .
- name: Cache
id: cache
uses: actions/cache@v2
with:
path: ~/.ccache
key: qt514

- name: Run build
run: |
docker run -v ~/.ccache:/root/ccache -v $(pwd):/usr/src/qgis qgis_build_deps /usr/src/qgis/.ci/qt5_14/build.sh
docker run -v $(pwd):/usr/src/qgis qgis_build_deps /usr/src/qgis/.ci/qt5_14/build.sh

0 comments on commit 724746c

Please sign in to comment.
You can’t perform that action at this time.