Skip to content

Commit

Permalink
fix(e2e script): backport from 71 fixes to the E2E script (#35477)
Browse files Browse the repository at this point in the history
Summary:
Because the /scripts folder for some reason is not typechecked at all, some changes broke the script and went undetected until we tried running it. This is a backport of those fixes:
* 67c373f
* 6107793
* 6107793

Also, it's backporting an improvement to the e2e local script clean to remove the hermes-engine pod cache which has been proven annoyingly in the way while testing:
* 9979e38

## Changelog

[Internal] [Fixed] - Fix e2e script not working and augment clean script

Pull Request resolved: #35477

Test Plan: Works on 0.71 ;)

Reviewed By: dmytrorykun

Differential Revision: D41530272

Pulled By: jacdebug

fbshipit-source-id: d45650d919ad5ef08438b307f122817d72771f46
  • Loading branch information
kelset authored and facebook-github-bot committed Nov 25, 2022
1 parent e680018 commit c4959b9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 0 additions & 2 deletions scripts/release-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ function generateiOSArtifacts(
jsiFolder,
hermesCoreSourceFolder,
buildType,
releaseVersion,
targetFolder,
) {
pushd(`${hermesCoreSourceFolder}`);
Expand All @@ -109,7 +108,6 @@ function generateiOSArtifacts(
const tarballOutputPath = createHermesPrebuiltArtifactsTarball(
hermesCoreSourceFolder,
buildType,
releaseVersion,
targetFolder,
true, // this is excludeDebugSymbols, we keep it as the default
);
Expand Down
3 changes: 3 additions & 0 deletions scripts/test-e2e-local-clean.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ exec('rm -rf /tmp/maven-local');
console.info('\n** Nuking the derived data folder **\n');
exec('rm -rf ~/Library/Developer/Xcode/DerivedData');

console.info('\n** Removing the hermes-engine pod cache **\n');
exec('rm -rf ~/Library/Caches/CocoaPods/Pods/External/hermes-engine');

// RNTester Pods
console.info('\n** Removing the RNTester Pods **\n');
exec('rm -rf packages/rn-tester/Pods');
Expand Down
5 changes: 2 additions & 3 deletions scripts/test-e2e-local.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ if (argv.target === 'RNTester') {

// for this scenario, we only need to create the debug build
// (env variable PRODUCTION defines that podspec side)
const buildType = 'Debug';
const buildTypeiOSArtifacts = 'Debug';

// the android ones get set into /private/tmp/maven-local
const localMavenPath = '/private/tmp/maven-local';
Expand All @@ -207,8 +207,7 @@ if (argv.target === 'RNTester') {
const tarballOutputPath = generateiOSArtifacts(
jsiFolder,
hermesCoreSourceFolder,
buildType,
releaseVersion,
buildTypeiOSArtifacts,
localMavenPath,
);

Expand Down

0 comments on commit c4959b9

Please sign in to comment.