Skip to content

Commit cf7f167

Browse files
author
Dane Pilcher
authored
ci: fix set npm prefix condition (#536)
1 parent c6c7b7a commit cf7f167

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎.circleci/config.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ jobs:
286286
environment:
287287
TEST_SUITE: src/__tests__/build-app-android.test.ts
288288
CLI_REGION: us-east-2
289-
DONT_SET_NPM_PREFIX: true
289+
SET_NPM_PREFIX: false
290290
build-app-swift-e2e-test:
291291
working_directory: ~/repo
292292
parameters: *ref_0
@@ -295,7 +295,7 @@ jobs:
295295
environment:
296296
TEST_SUITE: src/__tests__/build-app-swift.test.ts
297297
CLI_REGION: us-west-1
298-
DONT_SET_NPM_PREFIX: false
298+
SET_NPM_PREFIX: true
299299
build-app-ts-e2e-test:
300300
working_directory: ~/repo
301301
parameters: *ref_0
@@ -304,7 +304,7 @@ jobs:
304304
environment:
305305
TEST_SUITE: src/__tests__/build-app-ts.test.ts
306306
CLI_REGION: eu-west-2
307-
DONT_SET_NPM_PREFIX: false
307+
SET_NPM_PREFIX: true
308308
push-codegen-ios-e2e-test:
309309
working_directory: ~/repo
310310
parameters: *ref_0
@@ -313,7 +313,7 @@ jobs:
313313
environment:
314314
TEST_SUITE: src/__tests__/push-codegen-ios.test.ts
315315
CLI_REGION: eu-central-1
316-
DONT_SET_NPM_PREFIX: false
316+
SET_NPM_PREFIX: true
317317
push-codegen-android-e2e-test:
318318
working_directory: ~/repo
319319
parameters: *ref_0
@@ -322,7 +322,7 @@ jobs:
322322
environment:
323323
TEST_SUITE: src/__tests__/push-codegen-android.test.ts
324324
CLI_REGION: ap-northeast-1
325-
DONT_SET_NPM_PREFIX: false
325+
SET_NPM_PREFIX: true
326326
push-codegen-js-e2e-test:
327327
working_directory: ~/repo
328328
parameters: *ref_0
@@ -331,7 +331,7 @@ jobs:
331331
environment:
332332
TEST_SUITE: src/__tests__/push-codegen-js.test.ts
333333
CLI_REGION: ap-southeast-1
334-
DONT_SET_NPM_PREFIX: false
334+
SET_NPM_PREFIX: true
335335
pull-codegen-e2e-test:
336336
working_directory: ~/repo
337337
parameters: *ref_0
@@ -340,7 +340,7 @@ jobs:
340340
environment:
341341
TEST_SUITE: src/__tests__/pull-codegen.test.ts
342342
CLI_REGION: ap-southeast-2
343-
DONT_SET_NPM_PREFIX: false
343+
SET_NPM_PREFIX: true
344344
env-codegen-e2e-test:
345345
working_directory: ~/repo
346346
parameters: *ref_0
@@ -349,7 +349,7 @@ jobs:
349349
environment:
350350
TEST_SUITE: src/__tests__/env-codegen.test.ts
351351
CLI_REGION: us-east-2
352-
DONT_SET_NPM_PREFIX: false
352+
SET_NPM_PREFIX: true
353353
add-codegen-js-e2e-test:
354354
working_directory: ~/repo
355355
parameters: *ref_0
@@ -358,7 +358,7 @@ jobs:
358358
environment:
359359
TEST_SUITE: src/__tests__/add-codegen-js.test.ts
360360
CLI_REGION: us-west-1
361-
DONT_SET_NPM_PREFIX: false
361+
SET_NPM_PREFIX: true
362362
model-introspection-codegen-e2e-test:
363363
working_directory: ~/repo
364364
parameters: *ref_0
@@ -367,7 +367,7 @@ jobs:
367367
environment:
368368
TEST_SUITE: src/__tests__/model-introspection-codegen.test.ts
369369
CLI_REGION: eu-west-2
370-
DONT_SET_NPM_PREFIX: false
370+
SET_NPM_PREFIX: true
371371
add-codegen-ios-e2e-test:
372372
working_directory: ~/repo
373373
parameters: *ref_0
@@ -376,7 +376,7 @@ jobs:
376376
environment:
377377
TEST_SUITE: src/__tests__/add-codegen-ios.test.ts
378378
CLI_REGION: eu-central-1
379-
DONT_SET_NPM_PREFIX: false
379+
SET_NPM_PREFIX: true
380380
add-codegen-android-e2e-test:
381381
working_directory: ~/repo
382382
parameters: *ref_0
@@ -385,7 +385,7 @@ jobs:
385385
environment:
386386
TEST_SUITE: src/__tests__/add-codegen-android.test.ts
387387
CLI_REGION: ap-northeast-1
388-
DONT_SET_NPM_PREFIX: false
388+
SET_NPM_PREFIX: true
389389
datastore-modelgen-flutter-e2e-test:
390390
working_directory: ~/repo
391391
parameters: *ref_0
@@ -394,7 +394,7 @@ jobs:
394394
environment:
395395
TEST_SUITE: src/__tests__/datastore-modelgen-flutter.test.ts
396396
CLI_REGION: ap-southeast-1
397-
DONT_SET_NPM_PREFIX: false
397+
SET_NPM_PREFIX: true
398398
datastore-modelgen-ios-e2e-test:
399399
working_directory: ~/repo
400400
parameters: *ref_0
@@ -403,7 +403,7 @@ jobs:
403403
environment:
404404
TEST_SUITE: src/__tests__/datastore-modelgen-ios.test.ts
405405
CLI_REGION: ap-southeast-2
406-
DONT_SET_NPM_PREFIX: false
406+
SET_NPM_PREFIX: true
407407
datastore-modelgen-android-e2e-test:
408408
working_directory: ~/repo
409409
parameters: *ref_0
@@ -412,7 +412,7 @@ jobs:
412412
environment:
413413
TEST_SUITE: src/__tests__/datastore-modelgen-android.test.ts
414414
CLI_REGION: us-east-2
415-
DONT_SET_NPM_PREFIX: false
415+
SET_NPM_PREFIX: true
416416
datastore-modelgen-js-e2e-test:
417417
working_directory: ~/repo
418418
parameters: *ref_0
@@ -421,7 +421,7 @@ jobs:
421421
environment:
422422
TEST_SUITE: src/__tests__/datastore-modelgen-js.test.ts
423423
CLI_REGION: us-west-1
424-
DONT_SET_NPM_PREFIX: false
424+
SET_NPM_PREFIX: true
425425
remove-codegen-android-e2e-test:
426426
working_directory: ~/repo
427427
parameters: *ref_0
@@ -430,7 +430,7 @@ jobs:
430430
environment:
431431
TEST_SUITE: src/__tests__/remove-codegen-android.test.ts
432432
CLI_REGION: eu-west-2
433-
DONT_SET_NPM_PREFIX: false
433+
SET_NPM_PREFIX: true
434434
remove-codegen-ios-e2e-test:
435435
working_directory: ~/repo
436436
parameters: *ref_0
@@ -439,7 +439,7 @@ jobs:
439439
environment:
440440
TEST_SUITE: src/__tests__/remove-codegen-ios.test.ts
441441
CLI_REGION: eu-central-1
442-
DONT_SET_NPM_PREFIX: false
442+
SET_NPM_PREFIX: true
443443
remove-codegen-js-e2e-test:
444444
working_directory: ~/repo
445445
parameters: *ref_0
@@ -448,7 +448,7 @@ jobs:
448448
environment:
449449
TEST_SUITE: src/__tests__/remove-codegen-js.test.ts
450450
CLI_REGION: ap-northeast-1
451-
DONT_SET_NPM_PREFIX: false
451+
SET_NPM_PREFIX: true
452452
feature-flags-e2e-test:
453453
working_directory: ~/repo
454454
parameters: *ref_0
@@ -457,7 +457,7 @@ jobs:
457457
environment:
458458
TEST_SUITE: src/__tests__/feature-flags.test.ts
459459
CLI_REGION: ap-southeast-1
460-
DONT_SET_NPM_PREFIX: false
460+
SET_NPM_PREFIX: true
461461
configure-codegen-ios-e2e-test:
462462
working_directory: ~/repo
463463
parameters: *ref_0
@@ -466,7 +466,7 @@ jobs:
466466
environment:
467467
TEST_SUITE: src/__tests__/configure-codegen-ios.test.ts
468468
CLI_REGION: ap-southeast-2
469-
DONT_SET_NPM_PREFIX: false
469+
SET_NPM_PREFIX: true
470470
configure-codegen-android-e2e-test:
471471
working_directory: ~/repo
472472
parameters: *ref_0
@@ -475,7 +475,7 @@ jobs:
475475
environment:
476476
TEST_SUITE: src/__tests__/configure-codegen-android.test.ts
477477
CLI_REGION: us-east-2
478-
DONT_SET_NPM_PREFIX: false
478+
SET_NPM_PREFIX: true
479479
configure-codegen-js-e2e-test:
480480
working_directory: ~/repo
481481
parameters: *ref_0
@@ -484,7 +484,7 @@ jobs:
484484
environment:
485485
TEST_SUITE: src/__tests__/configure-codegen-js.test.ts
486486
CLI_REGION: us-west-1
487-
DONT_SET_NPM_PREFIX: false
487+
SET_NPM_PREFIX: true
488488
graphql-codegen-android-e2e-test:
489489
working_directory: ~/repo
490490
parameters: *ref_0
@@ -493,7 +493,7 @@ jobs:
493493
environment:
494494
TEST_SUITE: src/__tests__/graphql-codegen-android.test.ts
495495
CLI_REGION: eu-west-2
496-
DONT_SET_NPM_PREFIX: false
496+
SET_NPM_PREFIX: true
497497
graphql-codegen-js-e2e-test:
498498
working_directory: ~/repo
499499
parameters: *ref_0
@@ -502,7 +502,7 @@ jobs:
502502
environment:
503503
TEST_SUITE: src/__tests__/graphql-codegen-js.test.ts
504504
CLI_REGION: eu-central-1
505-
DONT_SET_NPM_PREFIX: false
505+
SET_NPM_PREFIX: true
506506
graphql-codegen-ios-e2e-test:
507507
working_directory: ~/repo
508508
parameters: *ref_0
@@ -511,7 +511,7 @@ jobs:
511511
environment:
512512
TEST_SUITE: src/__tests__/graphql-codegen-ios.test.ts
513513
CLI_REGION: ap-northeast-1
514-
DONT_SET_NPM_PREFIX: false
514+
SET_NPM_PREFIX: true
515515
workflows:
516516
version: 2
517517
e2e_resource_cleanup:

‎.circleci/local_publish_helpers.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function setNpmRegistryUrlToLocal {
3131

3232
function changeNpmGlobalPath {
3333
mkdir -p ~/.npm-global
34-
if [ ! $DONT_SET_NPM_PREFIX ]
34+
if [ $SET_NPM_PREFIX = true ]
3535
then
3636
npm config set prefix '~/.npm-global'
3737
fi

‎scripts/split-e2e-tests.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ function splitTests(
140140
// the npm prefix should not be set because this test runs on an executor
141141
// that needs to install Node separately. Setting the NPM prefix interferes
142142
// with the separate Node installation
143-
DONT_SET_NPM_PREFIX: shouldRunJobOnAndroid,
143+
SET_NPM_PREFIX: !shouldRunJobOnAndroid,
144144
},
145145
};
146146
return { ...acc, [newJobName]: newJob };

0 commit comments

Comments
 (0)