# [PATCH 0/2] gitlab-ci: some smallish updates for macOS jobs

3 messages from 2026-05-21 to 2026-05-21. Participants: Patrick Steinhardt.
Thread: https://gitlist.dev/t/65668

## Patrick Steinhardt, 2026-05-21 08:59

Subject: [PATCH 0/2] gitlab-ci: some smallish updates for macOS jobs
Message-ID: <20260521-b4-pks-gitlab-ci-updates-v1-0-53bb46ed33e0@pks.im>

```
Hi,

this patch series does some smallish updates for GitLab's CI jobs that
exercise macOS. A test run of this can be found at [1].

Thanks!

Patrick

[1]: https://gitlab.com/gitlab-org/git/-/merge_requests/576

---
Patrick Steinhardt (2):
      gitlab-ci: upgrade macOS runners
      gitlab-ci: update macOS image

 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


---
base-commit: aec3f587505a472db67e9462d0702e7d463a449d
change-id: 20260521-b4-pks-gitlab-ci-updates-3b4a959f8e0c


```

## Patrick Steinhardt, 2026-05-21 08:59

Subject: [PATCH 1/2] gitlab-ci: upgrade macOS runners
Message-ID: <20260521-b4-pks-gitlab-ci-updates-v1-1-53bb46ed33e0@pks.im>
In-Reply-To: <20260521-b4-pks-gitlab-ci-updates-v1-0-53bb46ed33e0@pks.im>

```
We're currently using M1-based runners for our macOS jobs. GitLab has
since introduced a new M2 Pro-based runner type that is available for
all GitLab tiers [1], which upgrades from 4 to 6 cores and from 8 to 16
GB RAM.

Upgrade to this new runner type, which results in some nice speedups:

  - osx-clang goes from 26 minutes to 16 minutes.

  - osx-meson goes from 19 minutes to 13 minutes.

  - osx-reftable goes from 23 minutes to 14 mintues.

[1]: https://docs.gitlab.com/ci/runners/hosted_runners/macos/

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83ec786c5a..1c6777acf3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,7 +79,7 @@ test:osx:
   stage: test
   needs: [ ]
   tags:
-    - saas-macos-medium-m1
+    - saas-macos-large-m2pro
   variables:
     TEST_OUTPUT_DIRECTORY: "/Volumes/RAMDisk"
   before_script:

-- 
2.54.0.926.g75ba10bac6.dirty


```

## Patrick Steinhardt, 2026-05-21 08:59

Subject: [PATCH 2/2] gitlab-ci: update macOS image
Message-ID: <20260521-b4-pks-gitlab-ci-updates-v1-2-53bb46ed33e0@pks.im>
In-Reply-To: <20260521-b4-pks-gitlab-ci-updates-v1-0-53bb46ed33e0@pks.im>

```
The GitLab CI jobs for macOS are all using the macOS 15 images. While
these images are not deprecated yet, there is a new image for macOS 26
generally available by now [1].

Switch two of our jobs to use the new image. The third job still
continues to use the old image. This ensures broader test coverage until
this old image gets deprecated.

[1]: https://docs.gitlab.com/ci/runners/hosted_runners/macos/

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c6777acf3..e0b9a0d82b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,10 +104,10 @@ test:osx:
         image: macos-15-xcode-16
         CC: clang
       - jobname: osx-reftable
-        image: macos-15-xcode-16
+        image: macos-26-xcode-26
         CC: clang
       - jobname: osx-meson
-        image: macos-15-xcode-16
+        image: macos-26-xcode-26
         CC: clang
   artifacts:
     paths:

-- 
2.54.0.926.g75ba10bac6.dirty


```