Skip to content

Commit 7116d0e

Browse files
authored
Merge pull request #18354 from mozilla/FXA-11115
task(ci): Make runs consistent
2 parents e58b1d1 + 7275436 commit 7116d0e

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

.circleci/config.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ commands:
292292
parameters:
293293
nx_run:
294294
type: string
295+
default: run-many
295296
steps:
296297
- run:
297298
name: Linting
@@ -301,6 +302,7 @@ commands:
301302
parameters:
302303
nx_run:
303304
type: string
305+
default: run-many
304306
steps:
305307
- run:
306308
name: Pre building shared libraries
@@ -564,7 +566,7 @@ jobs:
564566
parameters:
565567
nx_run:
566568
type: string
567-
default: affected --base=main --head=$CIRCLE_SHA1
569+
default: run-many
568570
executor: default-executor
569571
resource_class: small
570572
steps:
@@ -577,7 +579,7 @@ jobs:
577579
parameters:
578580
nx_run:
579581
type: string
580-
default: affected --base=main --head=$CIRCLE_SHA1
582+
default: run-many
581583
executor: default-executor
582584
resource_class: large
583585
steps:
@@ -591,7 +593,7 @@ jobs:
591593
parameters:
592594
nx_run:
593595
type: string
594-
default: affected --base=main --head=$CIRCLE_SHA1
596+
default: run-many
595597
executor: default-executor
596598
resource_class: medium+
597599
steps:
@@ -602,7 +604,7 @@ jobs:
602604
command: NODE_OPTIONS="--max-old-space-size=7168" npx nx run-many -t build --projects=tag:scope:shared:lib --parallel=2
603605
- run:
604606
name: Run unit tests
605-
command: npx nx << parameters.nx_run >> --parallel=2 -t test-unit
607+
command: NODE_OPTIONS="--max-old-space-size=7168" npx nx << parameters.nx_run >> --parallel=2 -t test-unit
606608
environment:
607609
NODE_ENV: test
608610
- store-artifacts
@@ -766,18 +768,21 @@ workflows:
766768
- Init (PR)
767769
- lint:
768770
name: Lint (PR)
771+
nx_run: affected --base=main --head=$CIRCLE_SHA1
769772
requires:
770773
- Init (PR)
771774
post-steps:
772775
- fail-fast
773776
- compile:
774777
name: Compile (PR)
778+
nx_run: affected --base=main --head=$CIRCLE_SHA1
775779
requires:
776780
- Init (PR)
777781
post-steps:
778782
- fail-fast
779783
- unit-test:
780784
name: Unit Test (PR)
785+
nx_run: affected --base=main --head=$CIRCLE_SHA1
781786
requires:
782787
- Build (PR)
783788
post-steps:
@@ -1080,17 +1085,14 @@ workflows:
10801085
- Init (nightly)
10811086
- lint:
10821087
name: Lint (nightly)
1083-
nx_run: 'run-many'
10841088
requires:
10851089
- Init (nightly)
10861090
- compile:
10871091
name: Compile (nightly)
1088-
nx_run: 'run-many'
10891092
requires:
10901093
- Init (nightly)
10911094
- unit-test:
10921095
name: Unit Test (nightly)
1093-
nx_run: 'run-many'
10941096
requires:
10951097
- Build (nightly)
10961098
- integration-test:

0 commit comments

Comments
 (0)