From e845c958160ec3cdddf798bc9ce4d9d01c23364d Mon Sep 17 00:00:00 2001
From: ebbit1q <ebbit1q@gmail.com>
Date: Tue, 28 Dec 2021 04:23:11 +0100
Subject: [PATCH] remove ccache from mac builds (#4505)

---
 .ci/compile.sh                      | 26 ++++++++++++++++++--------
 .github/workflows/desktop-build.yml | 22 +++-------------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/.ci/compile.sh b/.ci/compile.sh
index 82c7ebca..c2ce0bc6 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -49,6 +49,10 @@ while [[ "$@" ]]; do
       BUILDTYPE="Release"
       shift
       ;;
+    '--ccache')
+      USE_CCACHE=1
+      shift
+      ;;
     *)
       if [[ $1 == -* ]]; then
         echo "::error file=$0::unrecognized option: $1"
@@ -93,16 +97,20 @@ if [[ $PACKAGE_TYPE ]]; then
 fi
 
 if [[ $(uname) == "Darwin" ]]; then
-  # prepend ccache compiler binaries to path
-  PATH="/usr/local/opt/ccache/libexec:$PATH"
+  if [[ $USE_CCACHE ]]; then
+    # prepend ccache compiler binaries to path
+    PATH="/usr/local/opt/ccache/libexec:$PATH"
+  fi
   # Add qt install location when using homebrew
   flags+=" -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5/"
 fi
 
 # Compile
-echo "::group::Show ccache stats"
-ccache --show-stats
-echo "::endgroup::"
+if [[ $USE_CCACHE ]]; then
+  echo "::group::Show ccache stats"
+  ccache --show-stats
+  echo "::endgroup::"
+fi
 
 echo "::group::Configure cmake"
 cmake --version
@@ -113,9 +121,11 @@ echo "::group::Build project"
 cmake --build .
 echo "::endgroup::"
 
-echo "::group::Show ccache stats again"
-ccache --show-stats
-echo "::endgroup::"
+if [[ $USE_CCACHE ]]; then
+  echo "::group::Show ccache stats again"
+  ccache --show-stats
+  echo "::endgroup::"
+fi
 
 if [[ $MAKE_TEST ]]; then
   echo "::group::Run tests"
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 97b2ce52..f08412c4 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -152,7 +152,7 @@ jobs:
         shell: bash
         run: |
           source .ci/docker.sh
-          RUN --server --debug --test
+          RUN --server --debug --test --ccache
 
       - name: Build release package
         id: package
@@ -196,7 +196,7 @@ jobs:
         include:
           - target: Debug # tests only
             os: macos-latest
-            xcode: 12.1
+            xcode: 12.5.1
             type: Debug
             do_tests: 0 # tests do not work yet on mac
             make_package: false
@@ -231,7 +231,6 @@ jobs:
     continue-on-error: ${{matrix.allow-failure == 'yes'}}
 
     env:
-      CCACHE_DIR: ~/.ccache
       DEVELOPER_DIR:
         /Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer
 
@@ -243,7 +242,7 @@ jobs:
         shell: bash
         # cmake cannot find the mysql connector
         # neither of these works: mariadb-connector-c mysql-connector-c++
-        run: brew install ccache protobuf
+        run: brew update && brew install protobuf
 
       - name: Install QT using homebrew
         id: brew_install_qt
@@ -255,21 +254,6 @@ jobs:
         if: steps.brew_install_qt.outcome != 'success'
         uses: jurplel/install-qt-action@v2
 
-      - name: Get ccache timestamp
-        id: ccache_timestamp
-        shell: bash
-        run: echo "::set-output name=timestamp::$(date -u '+%Y%m%d%H%M%S')"
-
-      - name: Restore ccache cache
-        uses: actions/cache@v2
-        env:
-          timestamp: ${{steps.ccache_timestamp.outputs.timestamp}}
-        with:
-          path: ${{env.CCACHE_DIR}}
-          key: ${{runner.os}}-xcode-${{matrix.xcode}}-ccache-${{env.timestamp}}
-          restore-keys: |
-            ${{runner.os}}-xcode-${{matrix.xcode}}-ccache-
-
       - name: Build on Xcode ${{matrix.xcode}}
         shell: bash
         env: