From ed75bab7b284a9cb62b7308097108e4caef9a0b3 Mon Sep 17 00:00:00 2001
From: nastys <nastys@users.noreply.github.com>
Date: Sun, 9 Jul 2023 23:19:37 +0200
Subject: [PATCH] macOS CI: add Homebrew and Qt caches

---
 .ci/build-mac.sh | 19 +++++++++++++------
 .cirrus.yml      |  6 +++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh
index 5b87eac5fe..445df88ae2 100755
--- a/.ci/build-mac.sh
+++ b/.ci/build-mac.sh
@@ -1,5 +1,6 @@
 #!/bin/sh -ex
 
+export HOMEBREW_NO_AUTO_UPDATE=1
 brew install -f --overwrite nasm ninja git p7zip create-dmg ccache pipenv
 
 #/usr/sbin/softwareupdate --install-rosetta --agree-to-license
@@ -27,12 +28,18 @@ export WORKDIR;
 WORKDIR="$(pwd)"
 
 # Get Qt
-git clone https://github.com/engnr/qt-downloader.git
-cd qt-downloader
-git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597
-"/opt/homebrew/bin/pipenv" run pip3 install py7zr requests semantic_version lxml
-"/opt/homebrew/bin/pipenv" run ./qt-downloader macos desktop 5.15.2 clang_64 --opensource
-cd ..
+if [ ! -d "/tmp/Qt/5.15.2" ]; then
+  mkdir -p "/tmp/Qt"
+  git clone https://github.com/engnr/qt-downloader.git
+  cd qt-downloader
+  git checkout f52efee0f18668c6d6de2dec0234b8c4bc54c597
+  cd "/tmp/Qt"
+  "/opt/homebrew/bin/pipenv" run pip3 install py7zr requests semantic_version lxml
+  "/opt/homebrew/bin/pipenv" run "$WORKDIR/qt-downloader/qt-downloader" macos desktop 5.15.2 clang_64 --opensource
+fi
+
+cd "$WORKDIR"
+ditto "/tmp/Qt/5.15.2" "qt-downloader/5.15.2"
 
 export Qt5_DIR="$WORKDIR/qt-downloader/5.15.2/clang_64/lib/cmake/Qt5"
 export SDL2_DIR="$BREW_X64_PATH/opt/sdl2/lib/cmake/SDL2"
diff --git a/.cirrus.yml b/.cirrus.yml
index 7fa2bf79f6..8e8ff80d1f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -121,12 +121,16 @@ freebsd_task:
 
 macos_task:
   timeout_in: 12000m
+  homebrew_cache:
+    folder: /Users/admin/Library/Caches/Homebrew
+  qt_cache:
+    folder: /tmp/Qt
   ccache_cache:
     folder: /tmp/ccache_dir
   matrix:
     - name: Cirrus macOS
       macos_instance:
-        image: ghcr.io/cirruslabs/macos-monterey-xcode:14
+        image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
       mac_script:
         - mkdir artifacts
         - chmod +x ".ci/build-mac.sh"