From 3b68b37be0e58aeb8c31a36cef97474b6d9b5b26 Mon Sep 17 00:00:00 2001
From: HadhemiDD <43783545+HadhemiDD@users.noreply.github.com>
Date: Fri, 6 Dec 2024 11:49:37 +0100
Subject: [PATCH] Upgrade GitHub Actions mac runner. (#19163) (#19215)

* Upgrade GitHub Actions mac runner.

* Add changelog.

* Fix changelog PR number.

* Update docs/developer/meta/ci/testing.md

Co-authored-by: Kari Halsted <12926135+kayayarai@users.noreply.github.com>

---------

Co-authored-by: Kari Halsted <12926135+kayayarai@users.noreply.github.com>
(cherry picked from commit d02004e6de2c6634dcf4fe115afd0e6993bf94a1)

Co-authored-by: Enrico Donnici <enrico@nubtron.com>
---
 .github/workflows/build-ddev.yml         | 6 +++---
 .github/workflows/build-deps.yml         | 2 +-
 ddev/changelog.d/19163.changed           | 1 +
 ddev/src/ddev/utils/scripts/ci_matrix.py | 4 ++--
 docs/developer/meta/ci/testing.md        | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 ddev/changelog.d/19163.changed

diff --git a/.github/workflows/build-ddev.yml b/.github/workflows/build-ddev.yml
index 420238b467ecb..a293882e64306 100644
--- a/.github/workflows/build-ddev.yml
+++ b/.github/workflows/build-ddev.yml
@@ -80,9 +80,9 @@ jobs:
           os: windows-2022
         # macOS
         - target: aarch64-apple-darwin
-          os: macos-12
+          os: macos-13
         - target: x86_64-apple-darwin
-          os: macos-12
+          os: macos-13
 
     outputs:
       version: ${{ steps.version.outputs.version }}
@@ -361,7 +361,7 @@ jobs:
     name: Build macOS installer and sign/notarize artifacts
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
     needs: binaries
-    runs-on: macos-12
+    runs-on: macos-13
 
     env:
       VERSION: ${{ needs.binaries.outputs.version }}
diff --git a/.github/workflows/build-deps.yml b/.github/workflows/build-deps.yml
index 0052055a900e8..da303ce6b53fd 100644
--- a/.github/workflows/build-deps.yml
+++ b/.github/workflows/build-deps.yml
@@ -196,7 +196,7 @@ jobs:
 
   build-macos:
     name: Target macOS
-    runs-on: macos-12
+    runs-on: macos-13
 
     env:
       TARGET_NAME: macos-x86_64
diff --git a/ddev/changelog.d/19163.changed b/ddev/changelog.d/19163.changed
new file mode 100644
index 0000000000000..a30cf7c3ffb37
--- /dev/null
+++ b/ddev/changelog.d/19163.changed
@@ -0,0 +1 @@
+Ddev now uses the macos-13 runner instead of macos-13 for the generated test matrix, because the macos-12 runner is being discontinued by microsoft.
diff --git a/ddev/src/ddev/utils/scripts/ci_matrix.py b/ddev/src/ddev/utils/scripts/ci_matrix.py
index 2c9da736a53c9..04895dbcfa991 100644
--- a/ddev/src/ddev/utils/scripts/ci_matrix.py
+++ b/ddev/src/ddev/utils/scripts/ci_matrix.py
@@ -74,8 +74,8 @@
     'linux': __plat('Linux', 'ubuntu-22.04'),
     # https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md
     'windows': __plat('Windows', 'windows-2022'),
-    # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
-    'macos': __plat('macOS', 'macos-12'),
+    # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
+    'macos': __plat('macOS', 'macos-13'),
 }
 
 
diff --git a/docs/developer/meta/ci/testing.md b/docs/developer/meta/ci/testing.md
index 3377cdfb58406..f514b07df4f89 100644
--- a/docs/developer/meta/ci/testing.md
+++ b/docs/developer/meta/ci/testing.md
@@ -113,7 +113,7 @@ Configuration for targets [lives](https://github.com/DataDog/integrations-core/b
 | --- | --- | --- |
 | Linux | `linux` | [Ubuntu 22.04](https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md) |
 | Windows | `windows` | [Windows Server 2022](https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md) |
-| macOS | `macos` | [macOS 12](https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md) |
+| macOS | `macos` | [macOS 13](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md) |
 
 If an integration's `manifest.json` indicates that the only supported platform is Windows then that will be used to run tests, otherwise they will run on Linux.