From 417fb824b4490ec64ca6c746612e4663cd0c632a Mon Sep 17 00:00:00 2001
From: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>
Date: Wed, 23 Oct 2024 07:56:23 -0400
Subject: [PATCH 1/3] Upgrade GitHub runners from `macos-14` to `macos-15`.

Resolve #594

Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>
---
 .github/workflows/build-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 9e42026..6c21b68 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -31,7 +31,7 @@ jobs:
     # https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source
     # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners
     # https://github.com/mas-cli/mas/actions/runners
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
     # https://github.com/actions/checkout#usage

From 9e3b079ec83a1314f7f97527574f6e8953f7d30d Mon Sep 17 00:00:00 2001
From: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>
Date: Thu, 24 Oct 2024 07:46:50 -0400
Subject: [PATCH 2/3] Update `lint`.

- Change Swift bird emoji to ensure consistent spacing.

- Suppress output on GitHub runners.

- Simplify `grep` patterns.

Partial #594

Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>
---
 script/lint | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/script/lint b/script/lint
index c362dbb..58de5aa 100755
--- a/script/lint
+++ b/script/lint
@@ -30,14 +30,14 @@ done
 
 exit_code=0
 for source in Package.swift Sources Tests; do
-  printf -- $'--> 🕊  %s swift-format\n' "${source}"
+  printf -- $'--> 🦅 %s swift-format\n' "${source}"
   swift-format lint --strict --recursive "${source}"
   ((exit_code |= "${?}"))
-  printf -- $'--> 🕊  %s swiftformat\n' "${source}"
+  printf -- $'--> 🦅 %s swiftformat\n' "${source}"
   script -q /dev/null swiftformat --lint --strict "${source}" |
-    (grep -vxE $'Running SwiftFormat\\.\\.\\.\r|\\(lint mode - no files will be changed\\.\\)\r|Reading (?:config|swift-version) file at .*|\033\[32mSwiftFormat completed in \\d+\\.\\d+s\\.\033\\[0m\r|0/\\d+ files require formatting\\.\r' || true)
+    (grep -vxE '(?:\^D\x08{2})?Running SwiftFormat\.{3}\r|\(lint mode - no files will be changed\.\)\r|Reading (?:config|swift-version) file at .*|\x1b\[32mSwiftFormat completed in \d+\.\d+s\.\x1b\[0m\r|0/\d+ files require formatting\.\r' || true)
   ((exit_code |= "${?}"))
-  printf -- $'--> 🕊  %s swiftlint\n' "${source}"
+  printf -- $'--> 🦅 %s swiftlint\n' "${source}"
   swiftlint --strict --quiet "${source}" 2> \
     >((grep -vxF $'warning: Configuration option \'allow_multiline_func\' in \'opening_brace\' rule is deprecated. Use the option \'ignore_multiline_function_signatures\' instead.' || true) >&2)
   ((exit_code |= "${?}"))
@@ -66,7 +66,7 @@ PAGER='cat' git diff --check
 
 printf -- $'--> 🌀 Periphery\n'
 script -q /dev/null periphery scan --strict --quiet --disable-update-check |
-  (grep -vxF $'\033[0;1;32m* \033[0;0m\033[0;1mNo unused code detected.\033[0;0m\r\n' || true)
+  (grep -vxE '(?:\x1b\[0;1;32m|\^D\x08{2})\* (?:\x1b\[0;0m\x1b\[0;1m)?No unused code detected\.(?:\x1b\[0;0m)?\r' || true)
 ((exit_code |= "${?}"))
 
 exit "${exit_code}"

From cab684ba600c9d99b39c7552ad138e820ec286da Mon Sep 17 00:00:00 2001
From: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>
Date: Thu, 24 Oct 2024 07:49:43 -0400
Subject: [PATCH 3/3] Install `swiftlint` via `Brewfile` if macOS >= 13
 (install breaks on macOS <= 12).

Only install `peripheryapp/periphery` tap if macOS >= 13 (install breaks on macOS <= 12).

Resolve #594

Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>
---
 Brewfile         | 6 ++----
 script/bootstrap | 5 -----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Brewfile b/Brewfile
index 2638c4e..b198231 100644
--- a/Brewfile
+++ b/Brewfile
@@ -5,10 +5,8 @@ brew "swift-format"
 brew "swiftformat"
 brew "trash"
 
-# Already installed on GitHub Actions runner.
-# brew "swiftlint"
-
-tap "peripheryapp/periphery"
 if OS.mac? && MacOS.version >= :ventura
+  brew "swiftlint"
+  tap "peripheryapp/periphery"
   cask "periphery"
 end
diff --git a/script/bootstrap b/script/bootstrap
index 7448a03..09c06ac 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -20,8 +20,3 @@ printf $'==> 👢 Bootstrapping (%s)\n' "$(script/version)"
 # Install Homebrew tools
 rm -f Brewfile.lock.json
 brew bundle install --no-upgrade --verbose
-
-# swiftlint is already installed on GitHub Actions runners.
-if [[ ! -x "$(command -v swiftlint)" ]]; then
-  brew install swiftlint
-fi