Skip to content

Commit

Permalink
workflows: use macos-14 runner.
Browse files Browse the repository at this point in the history
- Use `macos-14` instead of `macos-13` most of the time.
- For `tests` and `test default formula` builds: run on both
  macOS 13 x86_64 and macOS 14 arm64
- Pretend `macos-14` is a self-hosted runner until a new version of
  `actionlint` is released which doesn't error on `macos-14`.
  • Loading branch information
MikeMcQuaid committed Feb 4, 2024
1 parent df32020 commit 2be2aa0
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
5 changes: 4 additions & 1 deletion .github/actionlint.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
self-hosted-runner:
# Labels of self-hosted runner in array of strings.
labels: []
labels:
# TODO: technically not a self-hosted runner but avoids errors until a new
# version of actionlint is released.
- macos-14
# Configuration variables in array of strings defined in your repository or
# organization. `null` means disabling configuration variables check.
# Empty array means no configuration variable is allowed.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sorbet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ permissions:
jobs:
tapioca:
if: github.repository == 'Homebrew/brew'
runs-on: macos-13
runs-on: macos-14
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jobs:
name: cask audit
needs: syntax
if: github.repository_owner == 'Homebrew'
runs-on: macos-13
runs-on: macos-14
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down Expand Up @@ -270,7 +270,7 @@ jobs:
- name: update-test (Ubuntu 22.04)
runs-on: ubuntu-22.04
- name: update-test (macOS 13)
runs-on: macos-13
runs-on: macos-14
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down Expand Up @@ -305,9 +305,12 @@ jobs:
- name: tests (Ubuntu 20.04)
test-flags: --coverage
runs-on: ubuntu-20.04
- name: tests (macOS 13)
- name: tests (macOS 13 x86_64)
test-flags: --coverage
runs-on: macos-13
- name: tests (macOS 14 arm64)
test-flags: --coverage
runs-on: macos-14
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down Expand Up @@ -406,8 +409,10 @@ jobs:
runs-on: ubuntu-22.04
- name: test default formula (Ubuntu 20.04)
runs-on: ubuntu-20.04
- name: test default formula (macOS 13)
- name: test default formula (macOS 13 x86_64)
runs-on: macos-13
- name: test default formula (macOS 14 arm64)
runs-on: macos-14
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand All @@ -419,6 +424,8 @@ jobs:

- run: brew test-bot --only-cleanup-before

- run: brew cleanup --prune-prefix

- run: brew test-bot --only-setup

- run: brew install gnu-tar
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vendor-gems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
contains(github.event.pull_request.title, '/Library/Homebrew')
)
)
runs-on: macos-13
runs-on: macos-14
steps:
- name: Set up Homebrew
id: set-up-homebrew
Expand Down

0 comments on commit 2be2aa0

Please sign in to comment.