Skip to content

Commit

Permalink
Revert "setting the iOS tarball variable so that every pod install fo…
Browse files Browse the repository at this point in the history
…r RNTestProject will succeed"

This reverts commit 0398ace.
  • Loading branch information
kelset committed Nov 2, 2022
1 parent 664e7cf commit 838bcd9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 0 additions & 2 deletions scripts/test-e2e-local-clean.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
13 changes: 7 additions & 6 deletions scripts/test-e2e-local.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down

0 comments on commit 838bcd9

Please sign in to comment.