From 931f53bc7cdfcd9af0302225940cc5b1ed3037c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Puyet?= Date: Mon, 6 Feb 2023 21:05:43 +0100 Subject: [PATCH 1/6] Bump ruby version to 3.2.0 --- .ruby-version | 2 +- Gemfile.lock | 20 ++++++++++---------- template/_ruby-version | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ruby-version b/.ruby-version index 49cdd668e1c8..944880fa15e8 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.6 +3.2.0 diff --git a/Gemfile.lock b/Gemfile.lock index 776cd69ccabd..e95dc2b58906 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.5) + CFPropertyList (3.0.6) rexml - activesupport (6.1.7) + activesupport (6.1.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -54,9 +54,9 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.0) escape (0.0.4) - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) ffi (1.15.5) fourflusher (2.3.1) @@ -65,8 +65,8 @@ GEM httpclient (2.8.3) i18n (1.12.0) concurrent-ruby (~> 1.0) - json (2.6.2) - minitest (5.16.3) + json (2.6.3) + minitest (5.17.0) molinillo (0.8.0) nanaimo (0.3.0) nap (1.1.0) @@ -76,7 +76,7 @@ GEM ruby-macho (2.5.1) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) xcodeproj (1.22.0) CFPropertyList (>= 2.3.3, < 4.0) @@ -85,7 +85,7 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.3.0) rexml (~> 3.2.4) - zeitwerk (2.6.0) + zeitwerk (2.6.6) PLATFORMS ruby @@ -94,7 +94,7 @@ DEPENDENCIES cocoapods (~> 1.11, >= 1.11.3) RUBY VERSION - ruby 2.7.6p219 + ruby 3.2.0p0 BUNDLED WITH - 2.3.22 + 2.4.1 diff --git a/template/_ruby-version b/template/_ruby-version index 49cdd668e1c8..944880fa15e8 100644 --- a/template/_ruby-version +++ b/template/_ruby-version @@ -1 +1 @@ -2.7.6 +3.2.0 From 051ce0f5d3db9f28f6d32fa7667a2beaaa8683e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Puyet?= Date: Tue, 7 Feb 2023 17:58:13 +0100 Subject: [PATCH 2/6] Bump Xcode to 14.2.0 and ruby to 3.1.3 --- .circleci/config.yml | 2 +- .ruby-version | 2 +- Gemfile.lock | 4 ++-- template/_ruby-version | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c86f1ce8fafa..8897eb6bdf59 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,7 +46,7 @@ references: # Dependency Anchors # ------------------------- dependency_versions: - xcode_version: &xcode_version "14.0.1" + xcode_version: &xcode_version "14.2.0" nodelts_image: &nodelts_image "cimg/node:18.12.1" nodeprevlts_image: &nodeprevlts_image "cimg/node:16.18.1" diff --git a/.ruby-version b/.ruby-version index 944880fa15e8..ff365e06b957 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.0 +3.1.3 diff --git a/Gemfile.lock b/Gemfile.lock index e95dc2b58906..cb2ef244ab13 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,7 +94,7 @@ DEPENDENCIES cocoapods (~> 1.11, >= 1.11.3) RUBY VERSION - ruby 3.2.0p0 + ruby 3.1.3p185 BUNDLED WITH - 2.4.1 + 2.3.26 diff --git a/template/_ruby-version b/template/_ruby-version index 944880fa15e8..ff365e06b957 100644 --- a/template/_ruby-version +++ b/template/_ruby-version @@ -1 +1 @@ -3.2.0 +3.1.3 From e4873e1c323d2c1ddd1e2c3788fe8f778fe39af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Puyet?= Date: Tue, 7 Feb 2023 21:34:00 +0100 Subject: [PATCH 3/6] Use new image build for macos --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8897eb6bdf59..db4d781a5b6d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,6 +6,7 @@ version: 2.1 orbs: win: circleci/windows@2.4.0 + macos: circleci/macos@2.3.3 # ------------------------- # REFERENCES @@ -160,10 +161,11 @@ commands: steps: - restore_cache: key: *gems_cache_key + - macos/switch-ruby: + version: "3.1.3" - run: name: Bundle Install command: | - source /usr/local/share/chruby/auto.sh bundle check || bundle install --path vendor/bundle --clean - save_cache: key: *gems_cache_key From 35263a2378d46d470556df21bc2546c0382b7ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Puyet?= Date: Tue, 7 Feb 2023 22:08:11 +0100 Subject: [PATCH 4/6] vendorize gems installation --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index db4d781a5b6d..171d92af68d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -888,7 +888,7 @@ jobs: command: | cd /tmp/$PROJECT_NAME/ios - bundle install + bundle install --path vendor/bundle --clean if [[ << parameters.flavor >> == "Release" ]]; then export PRODUCTION=1 From b246e0008f0aae7d6b645eb413a2270bec75b444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Puyet?= Date: Wed, 8 Feb 2023 21:18:57 +0100 Subject: [PATCH 5/6] debug --- .circleci/config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 171d92af68d9..824d98bd89ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -888,7 +888,7 @@ jobs: command: | cd /tmp/$PROJECT_NAME/ios - bundle install --path vendor/bundle --clean + bundle install if [[ << parameters.flavor >> == "Release" ]]; then export PRODUCTION=1 @@ -967,7 +967,9 @@ jobs: export USE_HERMES=0 fi - cd packages/rn-tester && bundle exec pod install + ls -l vendor/bundle/ruby + ls -l vendor/bundle/ruby/3.1.0/bin + cd packages/rn-tester && rbenv versions && bundle exec pod install - run: name: Build RNTester From caf132288ee47265899be8faaa9d4a770a22a55f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Puyet?= Date: Thu, 9 Feb 2023 09:25:16 +0100 Subject: [PATCH 6/6] more debug --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 824d98bd89ec..8ffb20c5b138 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -967,9 +967,10 @@ jobs: export USE_HERMES=0 fi - ls -l vendor/bundle/ruby - ls -l vendor/bundle/ruby/3.1.0/bin - cd packages/rn-tester && rbenv versions && bundle exec pod install + ls -l + pwd + rbenv versions + cd packages/rn-tester && bundle exec pod install - run: name: Build RNTester