From 8dc9e117f3fc4d86f4668c59847c8bca3d38ea1c Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 30 Sep 2024 09:02:23 +0100
Subject: [PATCH] github/workflows: use macos-15 GitHub Actions runners.

- Let's use this instead of macOS 14/latest when possible.
- Keep around macOS 13 to ensure we're still testing x86_64.
---
 .github/workflows/pkg-installer.yml |  6 ++++--
 .github/workflows/sorbet.yml        |  2 +-
 .github/workflows/tests.yml         | 12 ++++++------
 .github/workflows/vendor-gems.yml   |  2 +-
 Library/Homebrew/dev-cmd/tap-new.rb |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/pkg-installer.yml b/.github/workflows/pkg-installer.yml
index 7375f1bffd9e6..48f6bf03d59d5 100644
--- a/.github/workflows/pkg-installer.yml
+++ b/.github/workflows/pkg-installer.yml
@@ -23,7 +23,7 @@ defaults:
 jobs:
   build:
     if: github.repository_owner == 'Homebrew' && github.actor != 'dependabot[bot]'
-    runs-on: macos-latest
+    runs-on: macos-15
     outputs:
       installer_path: "Homebrew-${{ steps.homebrew-version.outputs.version }}.pkg"
     env:
@@ -143,6 +143,8 @@ jobs:
           # Apple Silicon
           - runner: macos-14
             name: macos-14-arm64
+          - runner: macos-15
+            name: macos-15-arm64
     steps:
       - name: Download installer from GitHub Actions
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
@@ -188,7 +190,7 @@ jobs:
 
   upload:
     needs: [build, test]
-    runs-on: macos-latest
+    runs-on: macos-15
     permissions:
       # To write assets to GitHub release
       contents: write
diff --git a/.github/workflows/sorbet.yml b/.github/workflows/sorbet.yml
index cbc9f9256581a..0e419bbfce9e4 100644
--- a/.github/workflows/sorbet.yml
+++ b/.github/workflows/sorbet.yml
@@ -25,7 +25,7 @@ defaults:
 jobs:
   tapioca:
     if: github.repository == 'Homebrew/brew'
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Set up Homebrew
         id: set-up-homebrew
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7f8b68a677b34..eab5ad55d4c50 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -165,7 +165,7 @@ jobs:
     name: cask audit
     needs: syntax
     if: github.repository_owner == 'Homebrew'
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Set up Homebrew
         id: set-up-homebrew
@@ -226,7 +226,7 @@ jobs:
           - name: update-test (Ubuntu 22.04)
             runs-on: ubuntu-22.04
           - name: update-test (macOS)
-            runs-on: macos-14
+            runs-on: macos-15
     steps:
       - name: Set up Homebrew
         id: set-up-homebrew
@@ -264,9 +264,9 @@ jobs:
           - name: tests (macOS 13 x86_64)
             test-flags: --coverage
             runs-on: macos-13
-          - name: tests (macOS 14 arm64)
+          - name: tests (macOS 15 arm64)
             test-flags: --coverage
-            runs-on: macos-14
+            runs-on: macos-15
     steps:
       - name: Set up Homebrew
         id: set-up-homebrew
@@ -369,8 +369,8 @@ jobs:
             runs-on: ubuntu-20.04
           - name: test default formula (macOS 13 x86_64)
             runs-on: macos-13
-          - name: test default formula (macOS 14 arm64)
-            runs-on: macos-14
+          - name: test default formula (macOS 15 arm64)
+            runs-on: macos-15
     env:
       HOMEBREW_TEST_BOT_ANALYTICS: 1
       HOMEBREW_ENFORCE_SBOM: 1
diff --git a/.github/workflows/vendor-gems.yml b/.github/workflows/vendor-gems.yml
index ef9cdc33e8f29..649d45bab6e44 100644
--- a/.github/workflows/vendor-gems.yml
+++ b/.github/workflows/vendor-gems.yml
@@ -27,7 +27,7 @@ defaults:
 jobs:
   vendor-gems:
     if: github.repository_owner == 'Homebrew'
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Set up Homebrew
         id: set-up-homebrew
diff --git a/Library/Homebrew/dev-cmd/tap-new.rb b/Library/Homebrew/dev-cmd/tap-new.rb
index b8356898f10de..6e59498428590 100644
--- a/Library/Homebrew/dev-cmd/tap-new.rb
+++ b/Library/Homebrew/dev-cmd/tap-new.rb
@@ -84,7 +84,7 @@ def run
             test-bot:
               strategy:
                 matrix:
-                  os: [ubuntu-22.04, macos-13, macos-14]
+                  os: [ubuntu-22.04, macos-13, macos-15]
               runs-on: ${{ matrix.os }}
               steps:
                 - name: Set up Homebrew