From df8ace1958c75df552e5ecdbc737a910880282a3 Mon Sep 17 00:00:00 2001
From: Abhinav Gupta <abhinav@pulumi.com>
Date: Fri, 3 Feb 2023 11:31:47 -0800
Subject: [PATCH] ci: Use macos-latest

In #11155, we pinned CI to macos-11
because we want to continue to support macOS 11.

This, however hsa created a new issue:
grpcio does not publish wheels for macos-11 anymore
and building it from source takes long enough to kill our CI
(see #12054 #12050).

To fix the issue while continuing to support older macOS,
run CI on macos-latest, but leave build jobs and friends on macos-11.

Resolves #12054, #12050
---
 .github/workflows/ci.yml    | 6 +++---
 .github/workflows/on-pr.yml | 2 +-
 scripts/get-job-matrix.py   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1bb6f4d6188..bafee520d9a0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ on:
         type: string
       acceptance-test-platforms:
         required: false
-        default: windows-latest macos-11
+        default: windows-latest macos-latest
         description: Platforms on which to run integration tests, as a space delimited list
         type: string
       enable-coverage:
@@ -117,8 +117,8 @@ jobs:
               { "os": "linux",   "arch": "arm64", "build-platform": "ubuntu-latest" },
               { "os": "windows", "arch": "amd64", "build-platform": "ubuntu-latest" },
               { "os": "windows", "arch": "arm64", "build-platform": "ubuntu-latest" },
-              { "os": "darwin",  "arch": "amd64", "build-platform": "macos-11" },
-              { "os": "darwin",  "arch": "arm64", "build-platform": "macos-11" }
+              { "os": "darwin",  "arch": "amd64", "build-platform": "macos-latest" },
+              { "os": "darwin",  "arch": "arm64", "build-platform": "macos-latest" }
             ]'
           fi
 
diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml
index d1290355ddce..0b1f51e0dca3 100644
--- a/.github/workflows/on-pr.yml
+++ b/.github/workflows/on-pr.yml
@@ -69,7 +69,7 @@ jobs:
       acceptance-test-platforms: >- # No newlines or trailing newline.
         ${{
           contains(github.event.pull_request.labels.*.name, 'ci/test')
-          && 'macos-11 windows-latest'
+          && 'macos-latest windows-latest'
           || ''
         }}
       enable-coverage: true
diff --git a/scripts/get-job-matrix.py b/scripts/get-job-matrix.py
index 59423c5965ff..ea605af153a4 100755
--- a/scripts/get-job-matrix.py
+++ b/scripts/get-job-matrix.py
@@ -88,7 +88,7 @@ class MakefileTest(TypedDict):
     {"name": "sdk/nodejs sxs_tests", "run": "cd sdk/nodejs && ../../scripts/retry make sxs_tests", "eta": 3},
 ]
 
-ALL_PLATFORMS = ["ubuntu-latest", "windows-latest", "macos-11"]
+ALL_PLATFORMS = ["ubuntu-latest", "windows-latest", "macos-latest"]
 
 
 MINIMUM_SUPPORTED_VERSION_SET = {