From e76c413d78c50643185153bc6acfe80511c18ef9 Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Wed, 11 Oct 2023 15:15:18 +0100 Subject: [PATCH] Fix CI for 0.71 --- .circleci/config.yml | 4 ++-- Gemfile.lock | 21 +++++++++++---------- packages/rn-tester/Gemfile | 2 +- scripts/update_podfile_lock.sh | 1 + 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e1f3e6b152bd7..5a65d31f114351 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -662,7 +662,7 @@ jobs: export USE_HERMES=0 fi - cd packages/rn-tester && bundle exec pod install --verbose + cd packages/rn-tester && bundle install && bundle exec pod install --verbose # ------------------------- # Runs iOS unit tests @@ -1011,7 +1011,7 @@ jobs: export USE_HERMES=0 fi - cd packages/rn-tester && bundle exec pod install + cd packages/rn-tester && bundle install && bundle exec pod install - run: name: Build RNTester diff --git a/Gemfile.lock b/Gemfile.lock index 4a9e53bf9b7aa3..0ad1aed51384c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.7) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -15,10 +15,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.1.0) - cocoapods (1.12.1) + cocoapods (1.13.0) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.12.1) + cocoapods-core (= 1.13.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -32,8 +32,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.12.1) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.13.0) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -57,7 +57,7 @@ GEM escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.15.5) + ffi (1.16.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -65,7 +65,7 @@ GEM i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.3) - minitest (5.19.0) + minitest (5.20.0) molinillo (0.8.0) nanaimo (0.3.0) nap (1.1.0) @@ -77,7 +77,7 @@ GEM ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.22.0) + xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -89,10 +89,11 @@ PLATFORMS ruby DEPENDENCIES + activesupport (>= 6.1.7.3, < 7.1.0) cocoapods (>= 1.11.3) RUBY VERSION - ruby 2.7.6p219 + ruby 3.2.0p0 BUNDLED WITH - 2.3.22 + 2.4.12 diff --git a/packages/rn-tester/Gemfile b/packages/rn-tester/Gemfile index d06aa10de2d509..ee20de088aa9ac 100644 --- a/packages/rn-tester/Gemfile +++ b/packages/rn-tester/Gemfile @@ -1,6 +1,6 @@ # Gemfile source 'https://rubygems.org' -gem 'cocoapods', '= 1.11.3' +gem 'cocoapods', '>= 1.11.3' gem 'rexml' gem 'activesupport', '>= 6.1.7.3', '< 7.1.0' diff --git a/scripts/update_podfile_lock.sh b/scripts/update_podfile_lock.sh index fa6db464666ebb..6cfca208a42dac 100755 --- a/scripts/update_podfile_lock.sh +++ b/scripts/update_podfile_lock.sh @@ -20,6 +20,7 @@ validate_env () { update_pods () { cd "$RNTESTER_DIR" || exit + bundle install || exit bundle check || exit bundle exec pod install cd "$THIS_DIR" || exit