add cache to mingw builds (#41734)

qgis · Feb 22, 2021 · 002e634 · 002e634
1 parent 61b6cc2
commit 002e634
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/.github/workflows/minw64.yml b/.github/workflows/minw64.yml
@@ -63,6 +63,7 @@ jobs:
 
       - name: Build QGIS Application
         run: |
+          mkdir -p ${GITHUB_WORKSPACE}/.ccache
           docker run \
             --env CCACHE_DIR=/QGIS/.ccache \
             -w /QGIS \

diff --git a/ms-windows/mingw/build.sh b/ms-windows/mingw/build.sh
@@ -71,13 +71,15 @@ installprefix="$installroot/usr/$arch-w64-mingw32/sys-root/mingw"
 rm -rf "$installroot"
 
 # Build
+echo "::group::cmake"
 mkdir -p "$BUILDDIR"
 (
   CRSSYNC_BIN=$(readlink -f "$SRCDIR")/build/output/bin/crssync
   cd "$BUILDDIR"
   QSCI_VER=$(grep -Eo '\s*([0-9]+\.[0-9]+\.[0-9]+)' "$MINGWROOT/include/qt5/Qsci/qsciglobal.h")
   mingw$bits-cmake \
     -DCMAKE_CROSS_COMPILING=1 \
+    -DUSE_CCACHE=ON \
     -DCMAKE_BUILD_TYPE=$buildtype \
     -DNATIVE_CRSSYNC_BIN="$CRSSYNC_BIN" \
     -DQSCINTILLA_VERSION_STR="$QSCI_VER" \
@@ -103,6 +105,8 @@ mkdir -p "$BUILDDIR"
     -DTXT2TAGS_EXECUTABLE= \
     ..
 )
+echo "::endgroup::"
+
 
 # Compile native crssync
 # mkdir -p $BUILDDIR/native_crssync
@@ -116,7 +120,12 @@ mkdir -p "$BUILDDIR"
 # Xvfb :99 &
 # export DISPLAY=:99
 
+echo "::group::compile QGIS"
 mingw$bits-make -C"$BUILDDIR" -j"$njobs" DESTDIR="${installroot}" install VERBOSE=1
+echo "::endgroup::"
+
+#echo "ccache statistics"
+ccache -s
 
 # Remove plugins with missing dependencies
 rm -rf "${installroot}/share/qgis/python/plugins/{MetaSearch,processing}"

diff --git a/ms-windows/mingw/qgis3-build-deps-mingw.dockerfile b/ms-windows/mingw/qgis3-build-deps-mingw.dockerfile
@@ -12,6 +12,7 @@ dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/smani/ming
 dnf install -y --nogpgcheck \
   mingw64-dlfcn \
   mingw64-exiv2 \
+  ccache \
   mingw64-gcc-c++ \
   mingw64-gdal \
   mingw64-gdb \