Skip to content

Commit 6fa0917

Browse files
authored
Merge pull request scratchfoundation#6038 from picklesrus/fix-circle
Get unittests and integration tests (consistently?) passing on circle again.
2 parents ea62a89 + 2dd493e commit 6fa0917

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ aliases:
4040
- v1-npm-
4141
- &defaults
4242
docker:
43-
- image: circleci/node:8.16-browsers
43+
- image: circleci/node:10-browsers
4444
working_directory: ~/repo
4545

4646
jobs:
@@ -76,7 +76,7 @@ jobs:
7676
name: Unit
7777
environment:
7878
JEST_JUNIT_OUTPUT_DIR: test-results/unit
79-
command: npm run test:unit -- --reporters="default" --reporters="jest-junit" --coverage --coverageReporters=text --coverageReporters=lcov
79+
command: npm run test:unit -- --reporters="default" --reporters="jest-junit" --coverage --coverageReporters=text --coverageReporters=lcov --maxWorkers="2"
8080
- store_artifacts:
8181
path: coverage
8282
- store_test_results:
@@ -123,7 +123,7 @@ jobs:
123123
JEST_JUNIT_OUTPUT_DIR: test-results/integration
124124
command: |
125125
export TESTFILES=$(circleci tests glob "test/integration/*.test.js" | circleci tests split --split-by=timings)
126-
$(npm bin)/jest ${TESTFILES} --reporters="default" --reporters="jest-junit"
126+
$(npm bin)/jest ${TESTFILES} --reporters="default" --reporters="jest-junit" --runInBand
127127
- store_test_results:
128128
path: test-results
129129

@@ -162,7 +162,7 @@ jobs:
162162
git config --global user.email $(git log --pretty=format:"%ae" -n1)
163163
git config --global user.name $(git log --pretty=format:"%an" -n1)
164164
- run: npm run deploy -- -e $CIRCLE_BRANCH
165-
165+
166166
workflows:
167167
version: 2
168168
build-test-deploy:

0 commit comments

Comments
 (0)