From 2733b9fa28c141603991a62766425903e08601e3 Mon Sep 17 00:00:00 2001 From: Vasilii Polikarpov <126792224+vpolikarpov-akvelon@users.noreply.github.com> Date: Tue, 25 Jul 2023 15:16:35 +0200 Subject: [PATCH] [macOS] Install swiftlint from Homebrew (#7912) --- images/macos/provision/core/swiftlint.sh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/images/macos/provision/core/swiftlint.sh b/images/macos/provision/core/swiftlint.sh index 5be1b0377..d01b73083 100644 --- a/images/macos/provision/core/swiftlint.sh +++ b/images/macos/provision/core/swiftlint.sh @@ -1,19 +1,16 @@ #!/bin/bash -e -o pipefail source ~/utils/utils.sh -echo "Install SwiftLint" -# SwiftLint now requires Swift 5.6 or higher to build, and macOS 12 or higher to run https://github.com/realm/SwiftLint/releases/tag/0.49.0 +echo Installing Swiftlint... if is_BigSur; then - version="0.48.0" + # SwiftLint now requires Swift 5.6 or higher to build, and macOS 12 or higher to run https://github.com/realm/SwiftLint/releases/tag/0.49.0 + COMMIT=d1d5743344227fe6e3c37cfba19f0cfe15a9448a + FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/$COMMIT/Formula/swiftlint.rb" + + curl -fsSL "$FORMULA_URL" > $(find $(brew --repository) -name swiftlint.rb) + HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install swiftlint else - version="latest" + brew_smart_install "swiftlint" fi -swiftlintUrl=$(get_github_package_download_url "realm/SwiftLint" "contains(\"portable_swiftlint.zip\")" "$version" "$API_PAT") -download_with_retries $swiftlintUrl "/tmp" "portable_swiftlint.zip" -unzip -q "/tmp/portable_swiftlint.zip" -d /usr/local/bin -# Remove the LICENSE file that comes along with the binary and the downloaded archive -rm -rf "/usr/local/bin/LICENSE" -rm -rf "/tmp/portable_swiftlint.zip" - invoke_tests "Linters" "SwiftLint"