From dad02f636490d559ea33e063018a4db9f627a9f9 Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Tue, 22 Nov 2022 12:00:34 +0000 Subject: [PATCH 1/4] [LOCAL] fix e2e script --- scripts/test-e2e-local.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/test-e2e-local.js b/scripts/test-e2e-local.js index 09b095d9ad59b0..5ab1e6b088519f 100644 --- a/scripts/test-e2e-local.js +++ b/scripts/test-e2e-local.js @@ -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'; @@ -207,7 +207,7 @@ if (argv.target === 'RNTester') { const tarballOutputPath = generateiOSArtifacts( jsiFolder, hermesCoreSourceFolder, - buildType, + buildTypeiOSArtifacts, releaseVersion, localMavenPath, ); From 11f817e2226e8b55bdcb8ab72d7f08eca89e1962 Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Tue, 22 Nov 2022 13:46:26 +0000 Subject: [PATCH 2/4] [LOCAL] fix removal of version from Hermes tarball --- scripts/release-utils.js | 1 - scripts/test-e2e-local.js | 1 - 2 files changed, 2 deletions(-) diff --git a/scripts/release-utils.js b/scripts/release-utils.js index 077096aa48fdec..6e10f79e136220 100644 --- a/scripts/release-utils.js +++ b/scripts/release-utils.js @@ -109,7 +109,6 @@ function generateiOSArtifacts( const tarballOutputPath = createHermesPrebuiltArtifactsTarball( hermesCoreSourceFolder, buildType, - releaseVersion, targetFolder, true, // this is excludeDebugSymbols, we keep it as the default ); diff --git a/scripts/test-e2e-local.js b/scripts/test-e2e-local.js index 5ab1e6b088519f..03605481c676a0 100644 --- a/scripts/test-e2e-local.js +++ b/scripts/test-e2e-local.js @@ -208,7 +208,6 @@ if (argv.target === 'RNTester') { jsiFolder, hermesCoreSourceFolder, buildTypeiOSArtifacts, - releaseVersion, localMavenPath, ); From 6c63797154d35515f96725e7bb9db8daafd5353d Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Tue, 22 Nov 2022 14:46:46 +0000 Subject: [PATCH 3/4] [LOCAL] fix removal of version from Hermes tarball, part 2 --- scripts/release-utils.js | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/release-utils.js b/scripts/release-utils.js index 6e10f79e136220..8c55be3d3bce03 100644 --- a/scripts/release-utils.js +++ b/scripts/release-utils.js @@ -85,7 +85,6 @@ function generateiOSArtifacts( jsiFolder, hermesCoreSourceFolder, buildType, - releaseVersion, targetFolder, ) { pushd(`${hermesCoreSourceFolder}`); From 380fb2d5500eb4be170bb28ef6040f3d1e4795ec Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Wed, 23 Nov 2022 11:39:17 +0000 Subject: [PATCH 4/4] [LOCAL] remove the hermes engine cache in the clean script --- scripts/test-e2e-local-clean.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/test-e2e-local-clean.js b/scripts/test-e2e-local-clean.js index 59f6333d793ffa..37ca37032732b5 100644 --- a/scripts/test-e2e-local-clean.js +++ b/scripts/test-e2e-local-clean.js @@ -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');