From dc23a17fb14df66657bb4fc22443e3ff3de05d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= <dehesselle@web.de>
Date: Fri, 18 Apr 2025 16:17:27 +0200
Subject: [PATCH] ci: Update macOS job for new CI runner

Remove settings no longer required on an ephemeral runner (redirecting
cache locations etc.).

Adjust cache settings.
---
 .gitlab-ci.yml | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b17183a2..f158851a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -791,17 +791,16 @@ freebsd-13-x86_64:
       - "_build/meson-logs"
 
 macos-arm64:
-  only:
-    - branches@GNOME/glib
-    # runner's maintainer
-    - branches@dehesselle/glib
-  except:
-    - tags
+  extends: .only-default
   stage: build
   tags:
-    - macosarm
+    - macos
+    - arm64
   needs: []
-  cache: []
+  cache:
+    - key: $CI_JOB_NAME_SLUG
+      paths:
+        - ccache
   variables:
     GIT_SUBMODULE_STRATEGY: normal
     # -Wno-overlength-strings
@@ -809,20 +808,17 @@ macos-arm64:
     # macOS limit string lengths to 4095B — pcre2_error.c has a string of length
     # 4380B
     CFLAGS: -Wno-overlength-strings
-    # redirect to the runner's volatile temporary directory
-    TMPDIR: /Users/Shared/work/tmp
-    # keep the user profile clean
-    PIP_CACHE_DIR: /Users/Shared/work/cache
-    PIPENV_CACHE_DIR: "${PIP_CACHE_DIR}"
-    PYTHONPYCACHEPREFIX: "${PIP_CACHE_DIR}"
     # target macOS 11 Big Sur
     SDKROOT: /opt/sdks/MacOSX11.3.sdk
-    # use the runner's ccache directory
-    CCACHE_DIR: /Users/Shared/work/ccache
+    CCACHE_DIR: $CI_PROJECT_DIR/ccache
+    CCACHE_MAXSIZE: "200Mi"
+    # Redirect to the runner's volatile temporary directory which
+    # unbreaks a couple of tests.
+    TMPDIR: /Volumes/RAM
   before_script:
     - bash .gitlab-ci/show-execution-environment.sh
     - python3 -m venv .venv
-    - curl -L https://github.com/ccache/ccache/releases/download/v4.9.1/ccache-4.9.1-darwin.tar.gz | tar -C .venv/bin -xz --strip-components=1 ccache-4.9.1-darwin/ccache
+    - ln -s /opt/ccache/ccache .venv/bin
     - source .venv/bin/activate
     - pip3 install meson==1.4.2 ninja==1.11.1.1 packaging==23.2
   script: