Skip to content

Commit 58c5aa6

Browse files
Upgrade runners to macOS 14 due to deprecation of macOS 13 (#21905)
* Upgrade runners to macOS 14 due to deprecation of macOS 13 * Add changelog * Update .github/workflows/resolve-build-deps.yaml Co-authored-by: Régis Desgroppes <regis.desgroppes@datadoghq.com> * Prefer macos-14 over macos-14-xlarge --------- Co-authored-by: Régis Desgroppes <regis.desgroppes@datadoghq.com>
1 parent 1c7f97d commit 58c5aa6

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

.github/workflows/build-ddev.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ jobs:
8080
os: windows-2022
8181
# macOS
8282
- target: aarch64-apple-darwin
83-
os: macos-13
83+
os: macos-14
8484
- target: x86_64-apple-darwin
85-
os: macos-13
85+
os: macos-14-large
8686

8787
outputs:
8888
version: ${{ steps.version.outputs.version }}
@@ -361,7 +361,7 @@ jobs:
361361
name: Build macOS installer and sign/notarize artifacts
362362
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
363363
needs: binaries
364-
runs-on: macos-13
364+
runs-on: macos-14-large
365365

366366
env:
367367
VERSION: ${{ needs.binaries.outputs.version }}

.github/workflows/resolve-build-deps.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,9 @@ jobs:
217217
matrix:
218218
job:
219219
- arch: x86_64
220-
os: macos-13
220+
os: macos-14-large
221221
- arch: aarch64
222-
os: macos-13-xlarge # "macOS 13 Arm64" as per https://github.com/actions/runner-images/blob/main/README.md
222+
os: macos-14 # "macOS 14 Arm64" as per https://github.com/actions/runner-images/blob/main/README.md
223223
env:
224224
TARGET_NAME: macos-${{ matrix.job.arch }}
225225
OUT_DIR: output/macos-${{ matrix.job.arch }}

.github/workflows/test-agent-target.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
job-name: "${{ inputs.integration }}-${{ inputs.platform }}-${{ inputs.environment }}"
5252
platform: ${{ inputs.platform }}
53-
runner: ${{ inputs.platform == 'linux' && '["ubuntu-22.04"]' || inputs.platform == 'windows' && '["windows-2022"]' || '["macos-13"]' }}
53+
runner: ${{ inputs.platform == 'linux' && '["ubuntu-22.04"]' || inputs.platform == 'windows' && '["windows-2022"]' || '["macos-14-large"]' }}
5454

5555
target: ${{ inputs.integration }}
5656

ddev/changelog.d/21905.fixed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade runners to macos-14 due to deprecation of macos-13

ddev/src/ddev/utils/scripts/ci_matrix.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
'linux': __plat('Linux', 'ubuntu-22.04'),
7575
# https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md
7676
'windows': __plat('Windows', 'windows-2022'),
77-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
78-
'macos': __plat('macOS', 'macos-13'),
77+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
78+
'macos': __plat('macOS', 'macos-14-large'),
7979
}
8080

8181
# The following integrations are no longer tested in CI

docs/developer/meta/ci/testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Configuration for targets [lives](https://github.com/DataDog/integrations-core/b
113113
| --- | --- | --- |
114114
| Linux | `linux` | [Ubuntu 22.04](https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md) |
115115
| Windows | `windows` | [Windows Server 2022](https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md) |
116-
| macOS | `macos` | [macOS 13](https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md) |
116+
| macOS | `macos` | [macOS 14](https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md) |
117117

118118
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.
119119

0 commit comments

Comments
 (0)