From 0609a021c8c36c1e4cc6b71af66159b004a9e29a Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Tue, 1 Nov 2022 13:47:09 +0000 Subject: [PATCH] Revert "setting the iOS tarball variable so that every pod install for RNTestProject will succeed" This reverts commit 0398aceac7fbcfd590de9b6ff140ea1f450b9d2b. --- scripts/test-e2e-local-clean.js | 2 -- scripts/test-e2e-local.js | 13 +++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/test-e2e-local-clean.js b/scripts/test-e2e-local-clean.js index 4f2d45cb278b1f..59f6333d793ffa 100644 --- a/scripts/test-e2e-local-clean.js +++ b/scripts/test-e2e-local-clean.js @@ -48,8 +48,6 @@ exec('rm -rf /tmp/maven-local'); // iOS console.info('\n** Nuking the derived data folder **\n'); exec('rm -rf ~/Library/Developer/Xcode/DerivedData'); -console.info('\n** Resetting HERMES_ENGINE_TARBALL_PATH env variable **\n'); -exec('unset HERMES_ENGINE_TARBALL_PATH'); // RNTester Pods console.info('\n** Removing the RNTester Pods **\n'); diff --git a/scripts/test-e2e-local.js b/scripts/test-e2e-local.js index 4201e86a6d17eb..90efd74e3d7e17 100644 --- a/scripts/test-e2e-local.js +++ b/scripts/test-e2e-local.js @@ -213,21 +213,22 @@ if (argv.target === 'RNTester') { cd('RNTestProject'); exec('yarn install'); - // need to do this here so that Android will be properly setup every time + // need to do this here so that Android will be properly setup either way exec( 'echo "REACT_NATIVE_MAVEN_LOCAL_REPO=/private/tmp/maven-local" >> android/gradle.properties', ); - // doing the same iOS side - I set it here so that the pod install will work every time - exec(`export HERMES_ENGINE_TARBALL_PATH=${tarballOutputPath}`); - if (argv.platform === 'iOS') { // if we want iOS, we need to do pod install - but with a trick cd('ios'); exec('bundle install'); - // set HERMES_ENGINE_TARBALL_PATH is set as ENV variable - exec(`USE_HERMES=${argv.hermes ? 1 : 0} bundle exec pod install --ansi`); + // set HERMES_ENGINE_TARBALL_PATH to point to the local artifacts I just created + exec( + `HERMES_ENGINE_TARBALL_PATH=${tarballOutputPath} USE_HERMES=${ + argv.hermes ? 1 : 0 + } bundle exec pod install --ansi`, + ); cd('..'); exec('yarn ios');