{"thread":{"id":"65668","subject":"[PATCH 0/2] gitlab-ci: some smallish updates for macOS jobs","startedAt":"2026-05-21T08:59:32Z","lastAt":"2026-05-21T08:59:35Z","messageCount":3,"participants":["Patrick Steinhardt"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"543807","messageId":"20260521-b4-pks-gitlab-ci-updates-v1-0-53bb46ed33e0@pks.im","threadId":"65668","inReplyTo":null,"subject":"[PATCH 0/2] gitlab-ci: some smallish updates for macOS jobs","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-05-21T08:59:23Z","receivedAt":"2026-05-21T08:59:32Z","isPatch":true,"body":"Hi,\n\nthis patch series does some smallish updates for GitLab's CI jobs that\nexercise macOS. A test run of this can be found at [1].\n\nThanks!\n\nPatrick\n\n[1]: https://gitlab.com/gitlab-org/git/-/merge_requests/576\n\n---\nPatrick Steinhardt (2):\n      gitlab-ci: upgrade macOS runners\n      gitlab-ci: update macOS image\n\n .gitlab-ci.yml | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\n\n---\nbase-commit: aec3f587505a472db67e9462d0702e7d463a449d\nchange-id: 20260521-b4-pks-gitlab-ci-updates-3b4a959f8e0c\n\n"},{"id":"543808","messageId":"20260521-b4-pks-gitlab-ci-updates-v1-1-53bb46ed33e0@pks.im","threadId":"65668","inReplyTo":"20260521-b4-pks-gitlab-ci-updates-v1-0-53bb46ed33e0@pks.im","subject":"[PATCH 1/2] gitlab-ci: upgrade macOS runners","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-05-21T08:59:24Z","receivedAt":"2026-05-21T08:59:32Z","isPatch":true,"body":"We're currently using M1-based runners for our macOS jobs. GitLab has\nsince introduced a new M2 Pro-based runner type that is available for\nall GitLab tiers [1], which upgrades from 4 to 6 cores and from 8 to 16\nGB RAM.\n\nUpgrade to this new runner type, which results in some nice speedups:\n\n  - osx-clang goes from 26 minutes to 16 minutes.\n\n  - osx-meson goes from 19 minutes to 13 minutes.\n\n  - osx-reftable goes from 23 minutes to 14 mintues.\n\n[1]: https://docs.gitlab.com/ci/runners/hosted_runners/macos/\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n .gitlab-ci.yml | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/.gitlab-ci.yml b/.gitlab-ci.yml\nindex 83ec786c5a..1c6777acf3 100644\n--- a/.gitlab-ci.yml\n+++ b/.gitlab-ci.yml\n@@ -79,7 +79,7 @@ test:osx:\n   stage: test\n   needs: [ ]\n   tags:\n-    - saas-macos-medium-m1\n+    - saas-macos-large-m2pro\n   variables:\n     TEST_OUTPUT_DIRECTORY: \"/Volumes/RAMDisk\"\n   before_script:\n\n-- \n2.54.0.926.g75ba10bac6.dirty\n\n"},{"id":"543809","messageId":"20260521-b4-pks-gitlab-ci-updates-v1-2-53bb46ed33e0@pks.im","threadId":"65668","inReplyTo":"20260521-b4-pks-gitlab-ci-updates-v1-0-53bb46ed33e0@pks.im","subject":"[PATCH 2/2] gitlab-ci: update macOS image","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-05-21T08:59:25Z","receivedAt":"2026-05-21T08:59:35Z","isPatch":true,"body":"The GitLab CI jobs for macOS are all using the macOS 15 images. While\nthese images are not deprecated yet, there is a new image for macOS 26\ngenerally available by now [1].\n\nSwitch two of our jobs to use the new image. The third job still\ncontinues to use the old image. This ensures broader test coverage until\nthis old image gets deprecated.\n\n[1]: https://docs.gitlab.com/ci/runners/hosted_runners/macos/\n\nSigned-off-by: Patrick Steinhardt <ps@pks.im>\n---\n .gitlab-ci.yml | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/.gitlab-ci.yml b/.gitlab-ci.yml\nindex 1c6777acf3..e0b9a0d82b 100644\n--- a/.gitlab-ci.yml\n+++ b/.gitlab-ci.yml\n@@ -104,10 +104,10 @@ test:osx:\n         image: macos-15-xcode-16\n         CC: clang\n       - jobname: osx-reftable\n-        image: macos-15-xcode-16\n+        image: macos-26-xcode-26\n         CC: clang\n       - jobname: osx-meson\n-        image: macos-15-xcode-16\n+        image: macos-26-xcode-26\n         CC: clang\n   artifacts:\n     paths:\n\n-- \n2.54.0.926.g75ba10bac6.dirty\n\n"}]}