From bbca0cba0b422ea571667fdc7ec5ca22523e2aa1 Mon Sep 17 00:00:00 2001 From: onevcat Date: Sat, 20 Apr 2024 16:41:52 +0900 Subject: [PATCH 1/9] Stop passing Swift version since only 5 is supported --- .github/workflows/build.yaml | 2 -- fastlane/Fastfile | 14 ++++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 719674940..303742d47 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,6 @@ jobs: 'tvOS Simulator,name=Apple TV', 'watchOS Simulator,name=Apple Watch Series 8 (41mm)' ] - swift-version: [5.0] steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 @@ -22,5 +21,4 @@ jobs: - name: Run tests env: DESTINATION: platform=${{ matrix.destination }} - SWIFT_VERSION: ${{ matrix.swift-version }} run: bundle exec fastlane test_ci diff --git a/fastlane/Fastfile b/fastlane/Fastfile index c609ed3d3..47aeb6f28 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -6,17 +6,17 @@ default_platform :ios platform :ios do desc "Runs all the tests" lane :tests do - test(destination: "platform=macOS", swift_version: "5.0") - test(destination: "platform=iOS Simulator,name=iPhone 14", swift_version: "5.0") - test(destination: "platform=tvOS Simulator,name=Apple TV", swift_version: "5.0") - build(destination: "platform=watchOS Simulator,name=Apple Watch Series 8 (41mm)", swift_version: "5.0") + test(destination: "platform=macOS") + test(destination: "platform=iOS Simulator,name=iPhone 14") + test(destination: "platform=tvOS Simulator,name=Apple TV") + build(destination: "platform=watchOS Simulator,name=Apple Watch Series 8 (41mm)") end lane :test_ci do if ENV["DESTINATION"].include? "watchOS" then - build(destination: ENV["DESTINATION"], swift_version: ENV["SWIFT_VERSION"]) + build(destination: ENV["DESTINATION"]) else - test(destination: ENV["DESTINATION"], swift_version: ENV["SWIFT_VERSION"]) + test(destination: ENV["DESTINATION"]) end end @@ -24,7 +24,6 @@ platform :ios do scan( scheme: "Kingfisher", clean: true, - xcargs: "SWIFT_VERSION=#{options[:swift_version]}", destination: options[:destination] ) end @@ -34,7 +33,6 @@ platform :ios do workspace: "Kingfisher.xcworkspace", configuration: "Debug", scheme: "Kingfisher", - xcargs: "SWIFT_VERSION=#{options[:swift_version]}", destination: options[:destination] ) end From 17c5b5ab837eda40f4a5368344113e41014cf27c Mon Sep 17 00:00:00 2001 From: onevcat Date: Sat, 20 Apr 2024 22:25:51 +0900 Subject: [PATCH 2/9] Set Xcode version matrix --- .github/workflows/build.yaml | 5 +++++ fastlane/Fastfile | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 303742d47..06b4d3d4b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,6 +13,10 @@ jobs: 'tvOS Simulator,name=Apple TV', 'watchOS Simulator,name=Apple Watch Series 8 (41mm)' ] + xcode: [ + '15.2', + '15.3' + ] steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 @@ -21,4 +25,5 @@ jobs: - name: Run tests env: DESTINATION: platform=${{ matrix.destination }} + XCODE_VERSION: ${{ matrix.xcode }} run: bundle exec fastlane test_ci diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 47aeb6f28..22136f967 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -130,7 +130,8 @@ platform :ios do end before_all do |lane| - xcodes(version: "15.2", select_for_current_build_only: true) + xcode_version = ENV["XCODE_VERSION"] || "15.3" + xcodes(version: xcode_version, select_for_current_build_only: true) end after_all do |lane| From 7de623ab2136cb80c5cecb2a9fc9979d231cde5e Mon Sep 17 00:00:00 2001 From: onevcat Date: Sat, 20 Apr 2024 22:34:22 +0900 Subject: [PATCH 3/9] Upgrade gems --- Gemfile.lock | 71 +++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9564eef11..e29585ea5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,11 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.6) + CFPropertyList (3.0.7) + base64 + nkf rexml - activesupport (7.1.3) + activesupport (7.1.3.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -18,27 +20,27 @@ GEM algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) - artifactory (3.0.15) + artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.889.0) - aws-sdk-core (3.191.1) + aws-partitions (1.917.0) + aws-sdk-core (3.192.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.77.0) + aws-sdk-kms (1.79.0) aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.143.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-s3 (1.147.0) + aws-sdk-core (~> 3, >= 3.192.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) - bigdecimal (3.1.6) + bigdecimal (3.1.7) claide (1.1.0) cocoapods (1.15.2) addressable (~> 2.8) @@ -88,13 +90,12 @@ GEM rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) dotenv (2.8.1) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) emoji_regex (3.2.3) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - excon (0.109.0) + excon (0.110.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -123,7 +124,7 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.3.0) + fastimage (2.3.1) fastlane (2.218.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) @@ -168,9 +169,9 @@ GEM fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.57.0) - google-apis-core (>= 0.12.0, < 2.a) - google-apis-core (0.13.0) + google-apis-androidpublisher_v3 (0.62.0) + google-apis-core (>= 0.14.0, < 2.a) + google-apis-core (0.14.1) addressable (~> 2.5, >= 2.5.1) googleauth (~> 1.9) httpclient (>= 2.8.1, < 3.a) @@ -178,28 +179,28 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml - google-apis-iamcredentials_v1 (0.18.0) - google-apis-core (>= 0.12.0, < 2.a) - google-apis-playcustomapp_v1 (0.14.0) - google-apis-core (>= 0.12.0, < 2.a) - google-apis-storage_v1 (0.33.0) - google-apis-core (>= 0.12.0, < 2.a) - google-cloud-core (1.6.1) + google-apis-iamcredentials_v1 (0.20.0) + google-apis-core (>= 0.14.0, < 2.a) + google-apis-playcustomapp_v1 (0.15.0) + google-apis-core (>= 0.14.0, < 2.a) + google-apis-storage_v1 (0.37.0) + google-apis-core (>= 0.14.0, < 2.a) + google-cloud-core (1.7.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (2.1.1) faraday (>= 1.0, < 3.a) - google-cloud-errors (1.3.1) - google-cloud-storage (1.48.1) + google-cloud-errors (1.4.0) + google-cloud-storage (1.50.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-core (~> 0.13) google-apis-iamcredentials_v1 (~> 0.18) - google-apis-storage_v1 (~> 0.33) + google-apis-storage_v1 (~> 0.37) google-cloud-core (~> 1.6) googleauth (~> 1.9) mini_mime (~> 1.0) - googleauth (1.10.0) + googleauth (1.11.0) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) @@ -210,14 +211,15 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.7.1) - jwt (2.7.1) + json (2.7.2) + jwt (2.8.1) + base64 mini_magick (4.12.0) mini_mime (1.1.5) - minitest (5.22.2) + minitest (5.22.3) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.4.0) @@ -226,11 +228,12 @@ GEM nap (1.1.0) naturally (2.2.1) netrc (0.11.0) - optparse (0.4.0) + nkf (0.2.0) + optparse (0.5.0) os (1.1.4) plist (3.7.1) public_suffix (4.0.7) - rake (13.1.0) + rake (13.2.1) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -242,7 +245,7 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) - signet (0.18.0) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) From 575b579d1d05ca321d7ae21bdf512ffbfefaccb4 Mon Sep 17 00:00:00 2001 From: onevcat Date: Tue, 23 Apr 2024 20:56:36 +0900 Subject: [PATCH 4/9] Keep only 15.2 --- .github/workflows/build.yaml | 5 ----- fastlane/Fastfile | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 06b4d3d4b..303742d47 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,10 +13,6 @@ jobs: 'tvOS Simulator,name=Apple TV', 'watchOS Simulator,name=Apple Watch Series 8 (41mm)' ] - xcode: [ - '15.2', - '15.3' - ] steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 @@ -25,5 +21,4 @@ jobs: - name: Run tests env: DESTINATION: platform=${{ matrix.destination }} - XCODE_VERSION: ${{ matrix.xcode }} run: bundle exec fastlane test_ci diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 22136f967..47aeb6f28 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -130,8 +130,7 @@ platform :ios do end before_all do |lane| - xcode_version = ENV["XCODE_VERSION"] || "15.3" - xcodes(version: xcode_version, select_for_current_build_only: true) + xcodes(version: "15.2", select_for_current_build_only: true) end after_all do |lane| From 5df78a3b5acf2f051e730cb3e38e60862fe2d845 Mon Sep 17 00:00:00 2001 From: onevcat Date: Tue, 23 Apr 2024 21:16:50 +0900 Subject: [PATCH 5/9] Upgrade fastlane --- Gemfile.lock | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e29585ea5..6de3ecb17 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,14 +125,14 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.3.1) - fastlane (2.218.0) + fastlane (2.220.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) - colored + colored (~> 1.2) commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) @@ -144,6 +144,7 @@ GEM gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) google-cloud-storage (~> 1.31) highline (~> 2.0) http-cookie (~> 1.0.5) @@ -152,10 +153,10 @@ GEM mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (>= 0.1.1) + optparse (>= 0.1.1, < 1.0.0) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) + security (= 0.1.5) simctl (~> 1.6.3) terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (~> 3) @@ -164,45 +165,43 @@ GEM word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) ffi (1.16.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.62.0) - google-apis-core (>= 0.14.0, < 2.a) - google-apis-core (0.14.1) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 1.9) + googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml - google-apis-iamcredentials_v1 (0.20.0) - google-apis-core (>= 0.14.0, < 2.a) - google-apis-playcustomapp_v1 (0.15.0) - google-apis-core (>= 0.14.0, < 2.a) - google-apis-storage_v1 (0.37.0) - google-apis-core (>= 0.14.0, < 2.a) + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) google-cloud-core (1.7.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (2.1.1) - faraday (>= 1.0, < 3.a) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.4.0) - google-cloud-storage (1.50.0) + google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) - google-apis-core (~> 0.13) - google-apis-iamcredentials_v1 (~> 0.18) - google-apis-storage_v1 (~> 0.37) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) google-cloud-core (~> 1.6) - googleauth (~> 1.9) + googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.11.0) - faraday (>= 1.0, < 3.a) - google-cloud-env (~> 2.1) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) @@ -244,7 +243,7 @@ GEM ruby-macho (2.5.1) ruby2_keywords (0.0.5) rubyzip (2.3.2) - security (0.1.3) + security (0.1.5) signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) From c7ecd16add2b898a58a6c1c2c0bdd91702bb960d Mon Sep 17 00:00:00 2001 From: onevcat Date: Wed, 24 Apr 2024 13:08:19 +0900 Subject: [PATCH 6/9] Use self runner --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 303742d47..b6daeb5e8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: run-test: - runs-on: macos-14 + runs-on: self-hosted strategy: matrix: destination: [ From c6c5740f73fac509b619a4062a2c43d6208b521d Mon Sep 17 00:00:00 2001 From: onevcat Date: Wed, 24 Apr 2024 13:10:30 +0900 Subject: [PATCH 7/9] Update ruby version --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 818bd47ab..15a279981 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.6 +3.3.0 From 8b5a5f760f51e050d2ec0957dbd74eeaee7729d6 Mon Sep 17 00:00:00 2001 From: onevcat Date: Wed, 24 Apr 2024 13:14:21 +0900 Subject: [PATCH 8/9] Self-hosted ruby --- .github/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b6daeb5e8..76eadf627 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,6 +18,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: bundler-cache: true + self-hosted: true - name: Run tests env: DESTINATION: platform=${{ matrix.destination }} From dda962ca24fb47cdba9d1bfec7857b40bd1aebb5 Mon Sep 17 00:00:00 2001 From: onevcat Date: Wed, 24 Apr 2024 14:25:46 +0900 Subject: [PATCH 9/9] Revert "Keep only 15.2" This reverts commit 575b579d1d05ca321d7ae21bdf512ffbfefaccb4. --- .github/workflows/build.yaml | 5 +++++ fastlane/Fastfile | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 76eadf627..c093458d0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,6 +13,10 @@ jobs: 'tvOS Simulator,name=Apple TV', 'watchOS Simulator,name=Apple Watch Series 8 (41mm)' ] + xcode: [ + '15.2', + '15.3' + ] steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 @@ -22,4 +26,5 @@ jobs: - name: Run tests env: DESTINATION: platform=${{ matrix.destination }} + XCODE_VERSION: ${{ matrix.xcode }} run: bundle exec fastlane test_ci diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 47aeb6f28..22136f967 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -130,7 +130,8 @@ platform :ios do end before_all do |lane| - xcodes(version: "15.2", select_for_current_build_only: true) + xcode_version = ENV["XCODE_VERSION"] || "15.3" + xcodes(version: xcode_version, select_for_current_build_only: true) end after_all do |lane|