From fa39760a49f5075116f901828343836011c3dcde Mon Sep 17 00:00:00 2001 From: Ladislas de Toldi Date: Mon, 5 Feb 2024 16:12:20 +0100 Subject: [PATCH 1/4] :technologist: (tools): Use mise to install tuist --- .mise.toml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .mise.toml diff --git a/.mise.toml b/.mise.toml new file mode 100644 index 000000000..40aa24d89 --- /dev/null +++ b/.mise.toml @@ -0,0 +1,2 @@ +[tools] +tuist = "3.42.2" From 9674804b2a1e93ac2115816112f240bdf1bbcf7d Mon Sep 17 00:00:00 2001 From: Ladislas de Toldi Date: Mon, 5 Feb 2024 16:25:36 +0100 Subject: [PATCH 2/4] :technologist: (tools): Mise - install swiftlint, swiftformat --- .mise.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mise.toml b/.mise.toml index 40aa24d89..d143d3e7d 100644 --- a/.mise.toml +++ b/.mise.toml @@ -1,2 +1,4 @@ [tools] tuist = "3.42.2" +swiftlint = "0.53.0" +swiftformat = "0.53.1" From bacd632ec7748c23651e2133435919269a8a1417 Mon Sep 17 00:00:00 2001 From: Ladislas de Toldi Date: Mon, 5 Feb 2024 16:26:21 +0100 Subject: [PATCH 3/4] :construction_worker: (ci): Setup mise to install tools --- .../ci-system-upgrade_tools_and_clean.yml | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-system-upgrade_tools_and_clean.yml b/.github/workflows/ci-system-upgrade_tools_and_clean.yml index 338175be6..4029d20e5 100644 --- a/.github/workflows/ci-system-upgrade_tools_and_clean.yml +++ b/.github/workflows/ci-system-upgrade_tools_and_clean.yml @@ -29,19 +29,25 @@ jobs: with: fetch-depth: 1 # shallow clone + - name: Install mise tools + uses: jdx/mise-action@v2 + - name: Tools' versions before run: | which xcodebuild xcodebuild -version + which tuist + tuist version + which fastlane fastlane --version which swiftlint swiftlint --version - which swift-format - swift-format --version + which swiftformat + swiftformat --version which bundle bundle --version @@ -50,7 +56,6 @@ jobs: run: | brew update brew upgrade - brew install tuist@3.39.3 brew cleanup -s --prune=all - name: Upgrade bundle @@ -70,17 +75,17 @@ jobs: which xcodebuild xcodebuild -version - which fastlane - fastlane --version - which tuist tuist version + which fastlane + fastlane --version + which swiftlint swiftlint --version - which swift-format - swift-format --version + which swiftformat + swiftformat --version which bundle bundle --version From b496010f95ed124b7fd79860c0327994202b21e4 Mon Sep 17 00:00:00 2001 From: Ladislas de Toldi Date: Mon, 5 Feb 2024 17:32:30 +0100 Subject: [PATCH 4/4] :construction_worker: (ci): Use mise for all workflows --- .github/workflows/ci-fastlane-release_beta_internal.yml | 3 +++ .github/workflows/ci-linter-swiftformat.yml | 4 ++++ .github/workflows/ci-linter-swiftlint.yml | 4 ++++ .github/workflows/ci-tuist-build.yml | 3 +++ .github/workflows/ci-tuist-unit_tests.yml | 3 +++ 5 files changed, 17 insertions(+) diff --git a/.github/workflows/ci-fastlane-release_beta_internal.yml b/.github/workflows/ci-fastlane-release_beta_internal.yml index c32475957..6c2ab29c2 100644 --- a/.github/workflows/ci-fastlane-release_beta_internal.yml +++ b/.github/workflows/ci-fastlane-release_beta_internal.yml @@ -37,6 +37,9 @@ jobs: with: fetch-depth: 1 # shallow clone + - name: Install mise tools + uses: jdx/mise-action@v2 + - name: bundle install run: | bundle install diff --git a/.github/workflows/ci-linter-swiftformat.yml b/.github/workflows/ci-linter-swiftformat.yml index ead7c5467..4355e52ba 100644 --- a/.github/workflows/ci-linter-swiftformat.yml +++ b/.github/workflows/ci-linter-swiftformat.yml @@ -24,11 +24,15 @@ jobs: fetch-depth: 0 # Fetch all history for all branches and tags lfs: true + - name: Install mise tools + uses: jdx/mise-action@v2 + - name: Run swiftformat run: | echo "" echo "🏃‍♂️ Running swiftformat" + which swiftformat swiftformat --version swiftformat --lint --reporter github-actions-log . diff --git a/.github/workflows/ci-linter-swiftlint.yml b/.github/workflows/ci-linter-swiftlint.yml index 6bc18e645..5fb506375 100644 --- a/.github/workflows/ci-linter-swiftlint.yml +++ b/.github/workflows/ci-linter-swiftlint.yml @@ -24,11 +24,15 @@ jobs: fetch-depth: 0 # Fetch all history for all branches and tags lfs: true + - name: Install mise tools + uses: jdx/mise-action@v2 + - name: Run swiftlint run: | echo "" echo "🏃‍♂️ Running swiftlint on modified files 🤵‍♂️" + which swiftlint swiftlint --version git diff origin/main --name-only --diff-filter=AMCR \ diff --git a/.github/workflows/ci-tuist-build.yml b/.github/workflows/ci-tuist-build.yml index 84f7040a9..bc8183184 100644 --- a/.github/workflows/ci-tuist-build.yml +++ b/.github/workflows/ci-tuist-build.yml @@ -30,6 +30,9 @@ jobs: fetch-depth: 1 # shallow clone lfs: true + - name: Install mise tools + uses: jdx/mise-action@v2 + - name: tuist fetch run: | TUIST_TURN_OFF_LINTERS=TRUE tuist fetch diff --git a/.github/workflows/ci-tuist-unit_tests.yml b/.github/workflows/ci-tuist-unit_tests.yml index e5317ccae..9b4c546e4 100644 --- a/.github/workflows/ci-tuist-unit_tests.yml +++ b/.github/workflows/ci-tuist-unit_tests.yml @@ -30,6 +30,9 @@ jobs: fetch-depth: 1 # shallow clone lfs: true + - name: Install mise tools + uses: jdx/mise-action@v2 + - name: tuist fetch run: | tuist fetch