diff --git a/.github/workflows/translations-pr.yml b/.github/workflows/translations-pr.yml index 27788c67b..ea5ad1036 100644 --- a/.github/workflows/translations-pr.yml +++ b/.github/workflows/translations-pr.yml @@ -14,8 +14,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Setup Project - run: swift run tools setup-project --ci + - name: Setup environment + run: + source ci_scripts/ci_common.sh && setup_github_actions_translations_environment - name: Download All Translations run: swift run tools download-strings --all-languages diff --git a/Tools/Sources/SetupProject.swift b/Tools/Sources/SetupProject.swift index dd4f65023..bb977c9ac 100644 --- a/Tools/Sources/SetupProject.swift +++ b/Tools/Sources/SetupProject.swift @@ -4,9 +4,6 @@ import Foundation struct SetupProject: ParsableCommand { static var configuration = CommandConfiguration(abstract: "A tool to setup the required components to efficiently run and contribute to Element X iOS") - @Flag(help: "Use this only on ci to avoid installing failing packages") - var ci = false - func run() throws { try setupGitHooks() try brewBundleInstall() @@ -19,10 +16,7 @@ struct SetupProject: ParsableCommand { } func brewBundleInstall() throws { - try Utilities.zsh("brew install --verbose xcodegen swiftgen swiftformat git-lfs sourcery mint kiliankoe/formulae/swift-outdated localazy/tools/localazy peripheryapp/periphery/periphery") - if !ci { - try Utilities.zsh("brew install swiftlint") - } + try Utilities.zsh("brew install xcodegen swiftgen swiftformat git-lfs sourcery mint kiliankoe/formulae/swift-outdated localazy/tools/localazy peripheryapp/periphery/periphery") } func mintPackagesInstall() throws { diff --git a/ci_scripts/ci_common.sh b/ci_scripts/ci_common.sh index fb64ad6ff..4df6e72e8 100755 --- a/ci_scripts/ci_common.sh +++ b/ci_scripts/ci_common.sh @@ -47,4 +47,13 @@ setup_github_actions_environment() { bundle config path vendor/bundle bundle install --jobs 4 --retry 3 +} + +setup_github_actions_translations_environment() { + unset HOMEBREW_NO_INSTALL_FROM_API + export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 + + brew update && brew install swiftgen mint localazy/tools/localazy + + mint install Asana/locheck } \ No newline at end of file