Merge pull request #38714 from m-kuhn/speedup_ogc_tests

Speedup ogc tests
qgis · Sep 13, 2020 · 2a3fdf1 · 2a3fdf1
2 parents d5350c6 + 1d37f26
commit 2a3fdf1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/.ci/ogc/Dockerfile b/.ci/ogc/Dockerfile
@@ -8,7 +8,6 @@ RUN apt-get update \
     && apt-get install -y \
   cmake \
   ninja-build \
-  ccache \
   clang \
   flex \
   bison \

diff --git a/.ci/ogc/build.sh b/.ci/ogc/build.sh
@@ -3,8 +3,6 @@
 mkdir /usr/src/qgis/build
 cd /usr/src/qgis/build || exit -1
 
-ccache -s
-
 cmake -GNinja \
  -DWITH_QUICK=OFF \
  -DWITH_3D=OFF \
@@ -15,6 +13,7 @@ cmake -GNinja \
  -DENABLE_PGTEST=OFF \
  -DENABLE_SAGA_TESTS=OFF \
  -DENABLE_MSSQLTEST=OFF \
+ -DENABLE_TESTS=OFF \
  -DWITH_QSPATIALITE=OFF \
  -DWITH_QWTPOLAR=OFF \
  -DWITH_APIDOC=OFF \
@@ -26,11 +25,9 @@ cmake -GNinja \
  -DWITH_ORACLE=OFF \
  -DDISABLE_DEPRECATED=ON \
  -DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
- -DCMAKE_C_COMPILER=/usr/lib/ccache/clang \
- -DCMAKE_CXX_COMPILER=/usr/lib/ccache/clang++ \
+ -DCMAKE_C_COMPILER=/bin/clang \
+ -DCMAKE_CXX_COMPILER=/bin/clang++ \
  -DADD_CLAZY_CHECKS=OFF \
  ..
 
 ninja
-
-ccache -s
diff --git a/.github/workflows/ogc.yml b/.github/workflows/ogc.yml
@@ -21,16 +21,9 @@ jobs:
         run: |
           docker build -t qgis_server_deps -f .ci/ogc/Dockerfile .ci/ogc/
 
-      - name: Cache
-        id: cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.ccache
-          key: ogc
-
       - name: Run build
         run: |
-          docker run -v ~/.ccache:/root/ccache -v $(pwd):/usr/src/qgis qgis_server_deps /usr/src/qgis/.ci/ogc/build.sh
+          docker run -v $(pwd):/usr/src/qgis qgis_server_deps /usr/src/qgis/.ci/ogc/build.sh
 
       - name: Install pyogctest
         run: |