From 991c1b23296d172ef591e2ba96754f575f05cc88 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Mon, 27 Apr 2026 13:48:30 +0200 Subject: [PATCH 1/3] Fix build --- .github/workflows/build.yml | 2 +- Gemfile | 3 +- Gemfile.lock | 66 ++++++++++++++++--------------------- run-tests.sh | 4 +-- 4 files changed, 33 insertions(+), 42 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ba43d142..41abebadb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: runs-on: ${{ matrix.os }} env: IOS_SIMULATOR: ${{ matrix.os == 'macos-15' && 'iPhone 16' || 'iPhone 16e' }} - IOS_VERSION: ${{ matrix.os == 'macos-15' && '18.5' || '26.0.1' }} + IOS_VERSION: ${{ matrix.os == 'macos-15' && '18.5' || '26.1' }} steps: - uses: actions/checkout@v4 - name: "xcrun simctl list" diff --git a/Gemfile b/Gemfile index 2770e85df..a891ee52b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,3 @@ source "https://rubygems.org" -# https://github.com/CocoaPods/CocoaPods/pull/12816 -gem 'cocoapods', :git => 'https://github.com/jberkel/CocoaPods.git', branch: 'watchos-fourflusher' +gem 'cocoapods' diff --git a/Gemfile.lock b/Gemfile.lock index 418fc7f43..6c17388f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,32 +1,8 @@ -GIT - remote: https://github.com/jberkel/CocoaPods.git - revision: 32a90c184bc5dc9ec8b7b9b8ad08e98b7253dec2 - branch: watchos-fourflusher - specs: - cocoapods (1.16.2) - addressable (~> 2.8) - claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.16.2) - cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 2.1, < 3.0) - cocoapods-plugins (>= 1.0.0, < 2.0) - cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.6.0, < 2.0) - cocoapods-try (>= 1.1.0, < 2.0) - colored2 (~> 3.1) - escape (~> 0.0.4) - fourflusher (>= 2.3.0, < 3.0) - gh_inspector (~> 1.0) - molinillo (~> 0.8.0) - nap (~> 1.0) - ruby-macho (~> 4.1.0) - xcodeproj (>= 1.27.0, < 2.0) - GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.8) - activesupport (7.2.3) + activesupport (7.2.3.1) base64 benchmark (>= 0.3) bigdecimal @@ -35,7 +11,7 @@ GEM drb i18n (>= 1.6, < 2) logger (>= 1.4.2) - minitest (>= 5.1) + minitest (>= 5.1, < 6) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) addressable (2.9.0) @@ -46,8 +22,26 @@ GEM atomos (0.1.3) base64 (0.3.0) benchmark (0.5.0) - bigdecimal (4.0.1) + bigdecimal (4.1.2) claide (1.1.0) + cocoapods (1.16.2) + addressable (~> 2.8) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.16.2) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.3.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.8.0) + nap (~> 1.0) + ruby-macho (>= 2.3.0, < 3.0) + xcodeproj (>= 1.27.0, < 2.0) cocoapods-core (1.16.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) @@ -75,8 +69,8 @@ GEM ethon (0.18.0) ffi (>= 1.15.0) logger - ffi (1.17.3) - ffi (1.17.3-arm64-darwin) + ffi (1.17.4) + ffi (1.17.4-arm64-darwin) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -84,22 +78,20 @@ GEM mutex_m i18n (1.14.8) concurrent-ruby (~> 1.0) - json (2.18.0) + json (2.19.4) logger (1.7.0) - minitest (6.0.1) - prism (~> 1.5) + minitest (5.27.0) molinillo (0.8.0) mutex_m (0.3.0) nanaimo (0.4.0) nap (1.1.0) netrc (0.11.0) - prism (1.7.0) public_suffix (4.0.7) rexml (3.4.4) - ruby-macho (4.1.0) + ruby-macho (2.5.1) securerandom (0.4.1) - typhoeus (1.4.1) - ethon (>= 0.9.0) + typhoeus (1.6.0) + ethon (>= 0.18.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) xcodeproj (1.27.0) @@ -115,7 +107,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods! + cocoapods BUNDLED WITH 2.6.9 diff --git a/run-tests.sh b/run-tests.sh index 3ffba8109..3ca460cbf 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -10,10 +10,10 @@ elif [ -n "$VALIDATOR_SUBSPEC" ]; then bundle install case "$VALIDATOR_SUBSPEC" in none) - bundle exec pod lib lint --no-subspecs --fail-fast + bundle exec pod lib lint --no-subspecs --fail-fast --platforms=ios,macos ;; *) - bundle exec pod lib lint --subspec="${VALIDATOR_SUBSPEC}" --fail-fast + bundle exec pod lib lint --subspec="${VALIDATOR_SUBSPEC}" --fail-fast --platforms=ios,macos ;; esac elif [ -n "$CARTHAGE_PLATFORM" ]; then From 970f6e2357f04a3ffdd7b3d1c5c822a4912165cb Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Mon, 27 Apr 2026 16:16:16 +0200 Subject: [PATCH 2/3] Update homebrew --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41abebadb..959ac97ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,6 +72,7 @@ jobs: run: ./run-tests.sh - name: "Run tests (tuist)" run: | + brew update brew install tuist cd Tests/Tuist/SQLite-Test tuist install From ee2db921986558d26d77b00e44f6b1aa5c34bbc3 Mon Sep 17 00:00:00 2001 From: Jan Berkel Date: Mon, 27 Apr 2026 17:07:22 +0200 Subject: [PATCH 3/3] Disable tuist test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 959ac97ac..b558eab37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,7 +76,7 @@ jobs: brew install tuist cd Tests/Tuist/SQLite-Test tuist install - tuist test + # tuist test build-linux: runs-on: ubuntu-latest steps: