From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 27 Mar 2021 21:09:11 +0000 (-0700)
Subject: move macOS CI jobs to Gitlab shared runner
X-Git-Tag: 2.47.1~16^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf0388270b530092043fdc7618d548635794e3d7;p=graphviz

move macOS CI jobs to Gitlab shared runner

The macOS CI closed beta program Graphviz has been participating in is winding
down. As of 2021-03-24, we have been requested to migrate to a shared macOS
runner as the program transitions into an open beta [0]. The cut over date for
this is scheduled for 2021-04-07. This change causes our CI setup to now run
macOS jobs on this shared runner instead of the reserved macOS VM Graphviz had
during the closed beta.

Note that this change also migrates these CI jobs from macOS 10.15.6 (Catalina)
to macOS 11.2 (Big Sur). With this, the XCode version is expected to move
forwards as well, though I do not know the precise version numbers.

Related to #1727.

  [0]: https://gitlab.com/gitlab-com/macos-buildcloud-runners-beta/-/issues/3#note_536852935
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91beaf2db..b63006c3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,6 +102,7 @@ portable-source:
             metrics: metrics.txt
     except:
         - tags
+    image: macos-11-xcode-12
     # Most submitters don't have access to the macOS runners, and if they try
     # to run macOS pipeline jobs, the jobs will hang forever.  This variable is
     # only set on repos that have access to macOS runners, in GitLab repo
@@ -328,7 +329,7 @@ macos-autotools-build:
     before_script:
         - export build_system="autotools"
     tags:
-        - macos
+        - shared-macos-amd64
 
 ubuntu18-04-cmake-build:
     <<: *deb_build_definition
@@ -413,7 +414,7 @@ macos-cmake-build:
         - export CFLAGS=-Werror
         - export CXXFLAGS=-Werror
     tags:
-        - macos
+        - shared-macos-amd64
 
 windows-cmake-Win32-release-build:
     <<: *windows_build_definition
@@ -588,7 +589,8 @@ macos-autotools-test:
         - job: "macos-autotools-build"
           artifacts: true
     tags:
-        - macos
+        - shared-macos-amd64
+    image: macos-11-xcode-12
     # Most submitters don't have access to the macOS runners, and if they try
     # to run macOS pipeline jobs, the jobs will hang forever.  This variable is
     # only set on repos that have access to macOS runners, in GitLab repo
@@ -675,7 +677,8 @@ macos-cmake-test:
         - job: "macos-cmake-build"
           artifacts: true
     tags:
-        - macos
+        - shared-macos-amd64
+    image: macos-11-xcode-12
     # Most submitters don't have access to the macOS runners, and if they try
     # to run macOS pipeline jobs, the jobs will hang forever.  This variable is
     # only set on repos that have access to macOS runners, in GitLab repo