Skip to content

Commit 553a273

Browse files
kelsetOlimpiaZurek
authored andcommitted
fix(e2e script): backport from 71 fixes to the E2E script (facebook#35477)
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: * facebook@67c373f * facebook@6107793 * facebook@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: * facebook@9979e38 ## Changelog [Internal] [Fixed] - Fix e2e script not working and augment clean script Pull Request resolved: facebook#35477 Test Plan: Works on 0.71 ;) Reviewed By: dmytrorykun Differential Revision: D41530272 Pulled By: jacdebug fbshipit-source-id: d45650d919ad5ef08438b307f122817d72771f46
1 parent c20e66d commit 553a273

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

scripts/release-utils.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ function generateiOSArtifacts(
8585
jsiFolder,
8686
hermesCoreSourceFolder,
8787
buildType,
88-
releaseVersion,
8988
targetFolder,
9089
) {
9190
pushd(`${hermesCoreSourceFolder}`);
@@ -109,7 +108,6 @@ function generateiOSArtifacts(
109108
const tarballOutputPath = createHermesPrebuiltArtifactsTarball(
110109
hermesCoreSourceFolder,
111110
buildType,
112-
releaseVersion,
113111
targetFolder,
114112
true, // this is excludeDebugSymbols, we keep it as the default
115113
);

scripts/test-e2e-local-clean.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ exec('rm -rf /tmp/maven-local');
4949
console.info('\n** Nuking the derived data folder **\n');
5050
exec('rm -rf ~/Library/Developer/Xcode/DerivedData');
5151

52+
console.info('\n** Removing the hermes-engine pod cache **\n');
53+
exec('rm -rf ~/Library/Caches/CocoaPods/Pods/External/hermes-engine');
54+
5255
// RNTester Pods
5356
console.info('\n** Removing the RNTester Pods **\n');
5457
exec('rm -rf packages/rn-tester/Pods');

scripts/test-e2e-local.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ if (argv.target === 'RNTester') {
198198

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

203203
// the android ones get set into /private/tmp/maven-local
204204
const localMavenPath = '/private/tmp/maven-local';
@@ -207,8 +207,7 @@ if (argv.target === 'RNTester') {
207207
const tarballOutputPath = generateiOSArtifacts(
208208
jsiFolder,
209209
hermesCoreSourceFolder,
210-
buildType,
211-
releaseVersion,
210+
buildTypeiOSArtifacts,
212211
localMavenPath,
213212
);
214213

0 commit comments

Comments
 (0)