From 2bcbfbcd57ade33b23d16537e7a581fadcc72ce4 Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Wed, 9 Nov 2022 08:32:24 +0000 Subject: [PATCH 1/2] Test ruby for release in a quicker way --- .circleci/config.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index f5c4881dbc1a61..dd0d3d0af53d0a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -159,6 +159,22 @@ commands: paths: - vendor/bundle + install_ruby_ubuntu: + steps: + - run: + name: setup rbenv + command: | + curl -fsSL https://github.com/rbenv/rbenv-installer/raw/HEAD/bin/rbenv-installer | bash + + echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc + echo "add eval(rbenv init) to ~/.bashrc" + echo 'eval "$(rbenv init -)"' >> ~/.bashrc + - run: + name: install ruby + command: | + rbenv install 2.7.6 --verbose + rbenv global 2.7.6 + run_yarn: parameters: yarn_base_cache_key: @@ -1360,6 +1376,10 @@ jobs: steps: - checkout_code_with_cache - run_yarn + - install_ruby_ubuntu + - run: + name: Which Ruby + command: which ruby - add_ssh_keys: fingerprints: - "1c:98:e0:3a:52:79:95:29:12:cd:b4:87:5b:41:e2:bb" From 91b6d3650b2809ff2ce45064e6d9bafca00ec5ca Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Wed, 9 Nov 2022 09:08:43 +0000 Subject: [PATCH 2/2] Fix: ensure that Codegen podspec don't force dependencies --- .circleci/config.yml | 20 -------------- .../cocoapods/__tests__/codegen_utils-test.rb | 24 ++++++++--------- scripts/cocoapods/codegen_utils.rb | 26 +++++++++---------- 3 files changed, 25 insertions(+), 45 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dd0d3d0af53d0a..f5c4881dbc1a61 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -159,22 +159,6 @@ commands: paths: - vendor/bundle - install_ruby_ubuntu: - steps: - - run: - name: setup rbenv - command: | - curl -fsSL https://github.com/rbenv/rbenv-installer/raw/HEAD/bin/rbenv-installer | bash - - echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc - echo "add eval(rbenv init) to ~/.bashrc" - echo 'eval "$(rbenv init -)"' >> ~/.bashrc - - run: - name: install ruby - command: | - rbenv install 2.7.6 --verbose - rbenv global 2.7.6 - run_yarn: parameters: yarn_base_cache_key: @@ -1376,10 +1360,6 @@ jobs: steps: - checkout_code_with_cache - run_yarn - - install_ruby_ubuntu - - run: - name: Which Ruby - command: which ruby - add_ssh_keys: fingerprints: - "1c:98:e0:3a:52:79:95:29:12:cd:b4:87:5b:41:e2:bb" diff --git a/scripts/cocoapods/__tests__/codegen_utils-test.rb b/scripts/cocoapods/__tests__/codegen_utils-test.rb index 989b7e87857788..35f732efac60ce 100644 --- a/scripts/cocoapods/__tests__/codegen_utils-test.rb +++ b/scripts/cocoapods/__tests__/codegen_utils-test.rb @@ -458,16 +458,16 @@ def get_podspec_no_fabric_no_script ].join(' ') }, 'dependencies': { - "FBReactNativeSpec": ["99.98.97"], - "React-jsiexecutor": ["99.98.97"], - "RCT-Folly": ["2021.07.22.00"], - "RCTRequired": ["99.98.97"], - "RCTTypeSafety": ["99.98.97"], - "React-Core": ["99.98.97"], - "React-jsi": ["99.98.97"], - "hermes-engine": ["99.98.97"], - "ReactCommon/turbomodule/bridging": ["99.98.97"], - "ReactCommon/turbomodule/core": ["99.98.97"] + "FBReactNativeSpec": [], + "React-jsiexecutor": [], + "RCT-Folly": [], + "RCTRequired": [], + "RCTTypeSafety": [], + "React-Core": [], + "React-jsi": [], + "hermes-engine": [], + "ReactCommon/turbomodule/bridging": [], + "ReactCommon/turbomodule/core": [] } } end @@ -476,8 +476,8 @@ def get_podspec_fabric_and_script_phases(script_phases) specs = get_podspec_no_fabric_no_script() specs[:dependencies].merge!({ - 'React-graphics': ["99.98.97"], - 'React-rncore': ["99.98.97"], + 'React-graphics': [], + 'React-rncore': [], }) specs[:'script_phases'] = script_phases diff --git a/scripts/cocoapods/codegen_utils.rb b/scripts/cocoapods/codegen_utils.rb index bd1c4648049eb9..488098d6b6561d 100644 --- a/scripts/cocoapods/codegen_utils.rb +++ b/scripts/cocoapods/codegen_utils.rb @@ -98,32 +98,32 @@ def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fa ].join(' ') }, 'dependencies': { - "FBReactNativeSpec": [version], - "React-jsiexecutor": [version], - "RCT-Folly": [folly_version], - "RCTRequired": [version], - "RCTTypeSafety": [version], - "React-Core": [version], - "React-jsi": [version], - "ReactCommon/turbomodule/bridging": [version], - "ReactCommon/turbomodule/core": [version] + "FBReactNativeSpec": [], + "React-jsiexecutor": [], + "RCT-Folly": [], + "RCTRequired": [], + "RCTTypeSafety": [], + "React-Core": [], + "React-jsi": [], + "ReactCommon/turbomodule/bridging": [], + "ReactCommon/turbomodule/core": [] } } if fabric_enabled spec[:'dependencies'].merge!({ - 'React-graphics': [version], - 'React-rncore': [version], + 'React-graphics': [], + 'React-rncore': [], }); end if hermes_enabled spec[:'dependencies'].merge!({ - 'hermes-engine': [version], + 'hermes-engine': [], }); else spec[:'dependencies'].merge!({ - 'React-jsc': [version], + 'React-jsc': [], }); end