From 2831335f4db41332348a07cfb1c6596a3e98c200 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Tue, 25 Apr 2023 11:22:21 +0800 Subject: [PATCH 1/6] workflows/build-pkg: run on `macos-13` --- .github/workflows/build-pkg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pkg.yml b/.github/workflows/build-pkg.yml index 1902420674..ccc5ca24f1 100644 --- a/.github/workflows/build-pkg.yml +++ b/.github/workflows/build-pkg.yml @@ -10,7 +10,7 @@ on: jobs: build: - runs-on: macos-12 + runs-on: macos-13 env: IDENTIFIER: sh.brew.Homebrew TMP_PATH: /tmp/brew From 3575ca9bbba3a70f004d0fbffd8060234c33b752 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Tue, 25 Apr 2023 11:22:35 +0800 Subject: [PATCH 2/6] workflows/sorbet: run on `macos-13` --- .github/workflows/sorbet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sorbet.yml b/.github/workflows/sorbet.yml index 68f13c2b1e..c6fa0db8be 100644 --- a/.github/workflows/sorbet.yml +++ b/.github/workflows/sorbet.yml @@ -21,7 +21,7 @@ permissions: jobs: tapioca: if: github.repository == 'Homebrew/brew' - runs-on: macos-12 + runs-on: macos-13 steps: - name: Set up Homebrew id: set-up-homebrew From c4020d9b71c9a8ad629581f8f0eb8dbfa87ef539 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Tue, 25 Apr 2023 11:23:01 +0800 Subject: [PATCH 3/6] workflows/tests: run on `macos-13` --- .github/workflows/tests.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 495ef5537c..4ab6e45c00 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -157,7 +157,7 @@ jobs: name: cask audit needs: syntax if: startsWith(github.repository, 'Homebrew/') - runs-on: macos-12 + runs-on: macos-13 env: HOMEBREW_NO_INSTALL_FROM_API: 1 steps: @@ -258,8 +258,8 @@ jobs: include: - name: update-test (Ubuntu 22.04) runs-on: ubuntu-22.04 - - name: update-test (macOS 12) - runs-on: macos-12 + - name: update-test (macOS 13) + runs-on: macos-13 steps: - name: Set up Homebrew id: set-up-homebrew @@ -300,9 +300,9 @@ jobs: - name: tests (Ubuntu 20.04) test-flags: --coverage runs-on: ubuntu-20.04 - - name: tests (macOS 12) + - name: tests (macOS 13) test-flags: --coverage - runs-on: macos-12 + runs-on: macos-13 steps: - name: Set up Homebrew id: set-up-homebrew @@ -390,8 +390,8 @@ jobs: runs-on: ubuntu-22.04 - name: test default formula (Ubuntu 20.04) runs-on: ubuntu-20.04 - - name: test default formula (macOS 12) - runs-on: macos-12 + - name: test default formula (macOS 13) + runs-on: macos-13 steps: - name: Set up Homebrew id: set-up-homebrew From 381cbe5f74e3a582fe04ef1fa11ed76ae602fa40 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Tue, 25 Apr 2023 11:23:18 +0800 Subject: [PATCH 4/6] workflows/vendor-gems: run on `macos-13` --- .github/workflows/vendor-gems.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/vendor-gems.yml b/.github/workflows/vendor-gems.yml index 51942b2470..4f7b31d13f 100644 --- a/.github/workflows/vendor-gems.yml +++ b/.github/workflows/vendor-gems.yml @@ -32,7 +32,7 @@ jobs: contains(github.event.pull_request.title, '/Library/Homebrew') ) ) - runs-on: macos-12 + runs-on: macos-13 steps: - name: Set up Homebrew id: set-up-homebrew From 6eaa0b2940537dcd322a8afa957acf057bc9884e Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Tue, 25 Apr 2023 11:24:00 +0800 Subject: [PATCH 5/6] dev-cmd/tap-new: run `brew test-bot` on `macos-13` --- Library/Homebrew/dev-cmd/tap-new.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/tap-new.rb b/Library/Homebrew/dev-cmd/tap-new.rb index 510b1e3030..6c186b0c9b 100644 --- a/Library/Homebrew/dev-cmd/tap-new.rb +++ b/Library/Homebrew/dev-cmd/tap-new.rb @@ -72,7 +72,7 @@ module Homebrew test-bot: strategy: matrix: - os: [ubuntu-22.04, macos-12] + os: [ubuntu-22.04, macos-13] runs-on: ${{ matrix.os }} steps: - name: Set up Homebrew From f729127fae6a12e173f55a59ef90a72c7cf18141 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Tue, 25 Apr 2023 17:55:22 +0800 Subject: [PATCH 6/6] actionlint.yaml: add workaround for `macos-13` --- .github/actionlint.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index 4ae8fc8639..5225a46b6e 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -2,6 +2,9 @@ self-hosted-runner: # Labels of self-hosted runner in array of strings. labels: - 11-arm64 + # FIXME: Remove `macos-13` when resolved: + # https://github.com/rhysd/actionlint/issues/296 + - macos-13 # 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.