Skip to content

Commit 0f40034

Browse files
committed
cipolleschi/fix test script (#41267)
1 parent c637f06 commit 0f40034

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

scripts/test-e2e-local.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,16 @@ async function testRNTestProject(circleCIArtifacts) {
183183
// create the local npm package to feed the CLI
184184

185185
// base setup required (specular to publish-npm.js)
186-
const baseVersion = require('../packages/react-native/package.json').version;
187186

188187
// in local testing, 1000.0.0 mean we are on main, every other case means we are
189188
// working on a release version
190-
const buildType = baseVersion !== '1000.0.0' ? 'release' : 'dry-run';
191189
const shortCommit = exec('git rev-parse HEAD', {silent: true})
192190
.toString()
193191
.trim()
194192
.slice(0, 9);
195193

196194
const releaseVersion = `1000.0.0-${shortCommit}`;
195+
const buildType = 'dry-run';
197196

198197
// Prepare some variables for later use
199198
const repoRoot = pwd();
@@ -204,6 +203,7 @@ async function testRNTestProject(circleCIArtifacts) {
204203
circleCIArtifacts != null
205204
? path.join(circleCIArtifacts.baseTmpPath(), 'maven-local')
206205
: '/private/tmp/maven-local';
206+
207207
const hermesPath = await prepareArtifacts(
208208
circleCIArtifacts,
209209
mavenLocalPath,
@@ -226,9 +226,16 @@ async function testRNTestProject(circleCIArtifacts) {
226226
cd('RNTestProject');
227227
exec('yarn install');
228228

229+
// When using CircleCI artifacts, the CI will zip maven local into a
230+
// /tmp/maven-local subfolder struct.
231+
// When we generate the project manually, there is no such structure.
232+
const expandedMavenLocal =
233+
circleCIArtifacts == null
234+
? mavenLocalPath
235+
: `${mavenLocalPath}/tmp/maven-local`;
229236
// need to do this here so that Android will be properly setup either way
230237
exec(
231-
`echo "react.internal.mavenLocalRepo=${mavenLocalPath}/tmp/maven-local" >> android/gradle.properties`,
238+
`echo "react.internal.mavenLocalRepo=${expandedMavenLocal}" >> android/gradle.properties`,
232239
);
233240

234241
// Update gradle properties to set Hermes as false

0 commit comments

Comments
 (0)