From 31663dbb12ab6751163d052dc72410d1dd3a83a2 Mon Sep 17 00:00:00 2001
From: Joseph Donofry <rubberduckie3554@gmail.com>
Date: Sat, 17 Feb 2024 14:47:30 -0500
Subject: Add apple silicon runner config to gitlab-ci

---
 .cirrus.yml    |  2 +-
 .gitlab-ci.yml | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index d572917c..00fc4c27 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -12,7 +12,7 @@ task:
   aqt_script:
     - pip3 install aqtinstall
     - mkdir $HOME/Qt
-    - aqt install-qt --outputdir $HOME/qt mac desktop 6 clang_64 -m qtlocation qtimageformats qtmultimedia qtpositioning qtshadertools
+    - aqt install-qt --outputdir $HOME/qt mac desktop 6.6 clang_64 -m qtlocation qtimageformats qtmultimedia qtpositioning qtshadertools
   build_script:
     - export QTPATH=($HOME/qt/6.*/macos/bin)
     - export PATH="$QTPATH:${PATH}"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b64e1d53..a3289e8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -259,6 +259,23 @@ build-macos:
       - .hunter/
       - "${CCACHE_DIR}"
 
+build-macos-as:
+  extends: build-macos
+  image: ghcr.io/cirruslabs/macos-ventura-xcode:14.3
+  tags: [macos-tart]
+  before_script:
+    # The following update-reset is a workaround for this issue: https://github.com/Homebrew/homebrew-bundle/issues/1179
+    - brew update-reset
+    - unset HOMEBREW_NO_AUTO_UPDATE
+    - brew bundle --file .ci/macos/Brewfile
+    - pip3 install aqtinstall
+    - mkdir $HOME/Qt
+    - aqt install-qt --outputdir $HOME/qt mac desktop 6.6 clang_64 -m qtlocation qtimageformats qtmultimedia qtpositioning qtshadertools
+  script:
+    - export QTPATH=($HOME/qt/6.*/macos/bin)
+    - export PATH="$QTPATH:${PATH}"
+    - ./.ci/macos/build.sh
+
 codesign-macos:
   stage: sign
   tags: [macos]
-- 
cgit v1.2.3