Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade GitHub Actions mac runner. #19163

Merged
merged 6 commits into from
Dec 2, 2024
+8 −7
Merged

Upgrade GitHub Actions mac runner. #19163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c7d70ae
Upgrade GitHub Actions mac runner.
nubtron Nov 28, 2024
135dd93
Add changelog.
nubtron Nov 29, 2024
1bf4074
Fix changelog PR number.
nubtron Nov 29, 2024
094fb1e
Merge branch 'master' into nubtron/upgrade-gha-mac-runner
nubtron Nov 29, 2024
3e45531
Update docs/developer/meta/ci/testing.md
nubtron Nov 29, 2024
776eade
Merge branch 'master' into nubtron/upgrade-gha-mac-runner
nubtron Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-ddev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ jobs:
os: windows-2022
# macOS
- target: aarch64-apple-darwin
os: macos-12
os: macos-13
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have you tried with 15?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FlorentClarret I haven't tried 15 - the reasoning for upgrading to 13 rather than jumping directly to 15 is that we want to minimize the chance of compatibility problems with 13.

- target: x86_64-apple-darwin
os: macos-12
os: macos-13

outputs:
version: ${{ steps.version.outputs.version }}
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-deps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ jobs:

build-macos:
name: Target macOS
runs-on: macos-12
runs-on: macos-13

env:
TARGET_NAME: macos-x86_64
Expand Down
1 change: 1 addition & 0 deletions ddev/changelog.d/19163.changed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 2 additions & 2 deletions ddev/src/ddev/utils/scripts/ci_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
}


Expand Down
2 changes: 1 addition & 1 deletion docs/developer/meta/ci/testing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Loading