Tune build with Qt 5.14

qgis · Sep 20, 2020 · 724746c · 724746c
1 parent 640f046
commit 724746c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/.ci/qt5_14/Dockerfile b/.ci/qt5_14/Dockerfile
@@ -3,7 +3,6 @@ MAINTAINER Matthias Kuhn <matthias@opengis.ch>
 
 RUN dnf -y install \
     bison \
-    ccache \
     clang \
     clazy \
     exiv2-devel \

diff --git a/.ci/qt5_14/build.sh b/.ci/qt5_14/build.sh
@@ -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
diff --git a/.github/workflows/qt5_14.yml b/.github/workflows/qt5_14.yml
@@ -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