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] 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