Upgrade GitHub Actions mac runner. (#19163)

* Upgrade GitHub Actions mac runner. * Add changelog. * Fix changelog PR number. * Update docs/developer/meta/ci/testing.md Co-authored-by: Kari Halsted <[email protected]> --------- Co-authored-by: Kari Halsted <[email protected]>
DataDog · Dec 2, 2024 · d02004e · d02004e
1 parent f527ddf
commit d02004e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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.