From c9d708b7fce6f910d77f5cb499796712f3bdfd04 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Thu, 21 May 2026 10:59:24 +0200 Subject: [PATCH 1/2] gitlab-ci: upgrade macOS runners 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 Signed-off-by: Junio C Hamano --- .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: From 62319b49bbe7e52df2cf90d8c4a5121112135784 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Thu, 21 May 2026 10:59:25 +0200 Subject: [PATCH 2/2] gitlab-ci: update macOS image 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 Signed-off-by: Junio C Hamano --- .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: