Skip to content

Commit 696c638

Browse files
committed
fix: jest
1 parent 166ab5d commit 696c638

2 files changed

Lines changed: 9 additions & 26 deletions

File tree

.circleci/config.yml

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -132,17 +132,6 @@ commands:
132132
- ".git"
133133

134134
jobs:
135-
prepare_workspace:
136-
<<: *defaults
137-
steps:
138-
- checkout
139-
- run:
140-
name: Git garbage collection
141-
command: git gc
142-
- persist_to_workspace:
143-
root: .
144-
paths:
145-
- '*'
146135
security-scans:
147136
<<: *defaults
148137
steps:
@@ -157,8 +146,7 @@ jobs:
157146
install_lint_build:
158147
<<: *defaults
159148
steps:
160-
- attach_workspace:
161-
at: ~/snyk-docker-plugin
149+
- checkout_with_cache
162150
- restore_cache:
163151
keys:
164152
- v2-npm-cache-{{ checksum "package.json" }}
@@ -184,10 +172,11 @@ jobs:
184172
<<: *defaults
185173
parallelism: 4 # Run tests across 4 containers
186174
steps:
187-
- attach_workspace:
188-
at: ~/snyk-docker-plugin
175+
- checkout_with_cache
189176
- setup_remote_docker:
190177
docker_layer_caching: true
178+
- attach_workspace:
179+
at: ~/snyk-docker-plugin
191180
- run:
192181
name: Run tests in parallel
193182
command: |
@@ -200,8 +189,7 @@ jobs:
200189
<<: *windows_big
201190
parallelism: 2 # Run tests across 2 containers
202191
steps:
203-
- attach_workspace:
204-
at: ~/snyk-docker-plugin
192+
- checkout
205193
- install_node_npm:
206194
node_version: << parameters.node_version >>
207195
- restore_cache:
@@ -224,7 +212,7 @@ jobs:
224212
command: |
225213
TEST=$(circleci tests glob "test/windows/**/*.spec.ts" | circleci tests split --split-by=timings | sed 's#\\\\#/#g')
226214
echo "TEST: $TEST"
227-
npm run test-jest-windows -- --reporters=default --reporters=jest-junit $TEST
215+
npm run test-jest-windows -- $TEST
228216
environment:
229217
JEST_JUNIT_OUTPUT_DIR: './reports/junit'
230218
JEST_JUNIT_ADD_FILE_ATTRIBUTE: 'true' # We need this to make --split-by=timings work
@@ -234,8 +222,7 @@ jobs:
234222
<<: *windows_big
235223
parallelism: 2 # Run tests across 2 containers
236224
steps:
237-
- attach_workspace:
238-
at: ~/snyk-docker-plugin
225+
- checkout
239226
- install_node_npm:
240227
node_version: << parameters.node_version >>
241228
- setup_npm_user
@@ -249,7 +236,7 @@ jobs:
249236
name: Run Windows tests in parallel
250237
command: |
251238
TEST=$(circleci tests glob "test/windows/**/*.spec.ts" | circleci tests split --split-by=timings | sed 's#\\\\#/#g')
252-
npm run test-jest-windows -- --reporters=default --reporters=jest-junit $TEST
239+
npm run test-jest-windows -- $TEST
253240
environment:
254241
JEST_JUNIT_OUTPUT_DIR: './reports/junit'
255242
JEST_JUNIT_ADD_FILE_ATTRIBUTE: 'true' # We need this to make --split-by=timings work
@@ -314,8 +301,6 @@ workflows:
314301
not:
315302
equal: [scheduled_pipeline, << pipeline.trigger_source >>]
316303
jobs:
317-
- prepare_workspace:
318-
name: Prepare workspace
319304
- prodsec/secrets-scan:
320305
name: Scan repository for secrets
321306
context:
@@ -331,8 +316,6 @@ workflows:
331316
- snyk-bot-slack
332317
post-steps:
333318
- *slack-fail-notify
334-
requires:
335-
- Prepare workspace
336319
- security-scans:
337320
name: Security Scans
338321
context: infrasec_container

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"format": "prettier --loglevel warn --write '{lib,test}/**/*.ts' && tslint --fix --format stylish '{lib,test}/**/*.ts'",
2222
"test": "npm run test-jest",
2323
"test-jest": "jest --ci --maxWorkers=3 --logHeapUsage --colors",
24-
"test-jest-windows": "jest --ci --maxWorkers=50% --config test/windows/jest.config.js --logHeapUsage --verbose",
24+
"test-jest-windows": "jest --ci --maxWorkers=50% --config test/windows/jest.config.js --logHeapUsage --reporters=default --reporters=jest-junit",
2525
"prepare": "npm run build"
2626
},
2727
"engines": {

0 commit comments

Comments
 (0)