workflows: use macos-14 runner.

- 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`.
This commit is contained in:
Mike McQuaid 2024-02-04 12:12:12 +01:00
parent df32020fb7
commit 2be2aa0dc8
No known key found for this signature in database
GPG Key ID: 3338A31AFDB1D829
4 changed files with 17 additions and 7 deletions

View File

@ -1,6 +1,9 @@
self-hosted-runner: self-hosted-runner:
# Labels of self-hosted runner in array of strings. # 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 # Configuration variables in array of strings defined in your repository or
# organization. `null` means disabling configuration variables check. # organization. `null` means disabling configuration variables check.
# Empty array means no configuration variable is allowed. # Empty array means no configuration variable is allowed.

View File

@ -21,7 +21,7 @@ permissions:
jobs: jobs:
tapioca: tapioca:
if: github.repository == 'Homebrew/brew' if: github.repository == 'Homebrew/brew'
runs-on: macos-13 runs-on: macos-14
steps: steps:
- name: Set up Homebrew - name: Set up Homebrew
id: set-up-homebrew id: set-up-homebrew

View File

@ -165,7 +165,7 @@ jobs:
name: cask audit name: cask audit
needs: syntax needs: syntax
if: github.repository_owner == 'Homebrew' if: github.repository_owner == 'Homebrew'
runs-on: macos-13 runs-on: macos-14
steps: steps:
- name: Set up Homebrew - name: Set up Homebrew
id: set-up-homebrew id: set-up-homebrew
@ -270,7 +270,7 @@ jobs:
- name: update-test (Ubuntu 22.04) - name: update-test (Ubuntu 22.04)
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
- name: update-test (macOS 13) - name: update-test (macOS 13)
runs-on: macos-13 runs-on: macos-14
steps: steps:
- name: Set up Homebrew - name: Set up Homebrew
id: set-up-homebrew id: set-up-homebrew
@ -305,9 +305,12 @@ jobs:
- name: tests (Ubuntu 20.04) - name: tests (Ubuntu 20.04)
test-flags: --coverage test-flags: --coverage
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
- name: tests (macOS 13) - name: tests (macOS 13 x86_64)
test-flags: --coverage test-flags: --coverage
runs-on: macos-13 runs-on: macos-13
- name: tests (macOS 14 arm64)
test-flags: --coverage
runs-on: macos-14
steps: steps:
- name: Set up Homebrew - name: Set up Homebrew
id: set-up-homebrew id: set-up-homebrew
@ -406,8 +409,10 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
- name: test default formula (Ubuntu 20.04) - name: test default formula (Ubuntu 20.04)
runs-on: 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 runs-on: macos-13
- name: test default formula (macOS 14 arm64)
runs-on: macos-14
steps: steps:
- name: Set up Homebrew - name: Set up Homebrew
id: set-up-homebrew id: set-up-homebrew
@ -419,6 +424,8 @@ jobs:
- run: brew test-bot --only-cleanup-before - run: brew test-bot --only-cleanup-before
- run: brew cleanup --prune-prefix
- run: brew test-bot --only-setup - run: brew test-bot --only-setup
- run: brew install gnu-tar - run: brew install gnu-tar

View File

@ -32,7 +32,7 @@ jobs:
contains(github.event.pull_request.title, '/Library/Homebrew') contains(github.event.pull_request.title, '/Library/Homebrew')
) )
) )
runs-on: macos-13 runs-on: macos-14
steps: steps:
- name: Set up Homebrew - name: Set up Homebrew
id: set-up-homebrew id: set-up-homebrew