Skip to content

Commit 40eedab

Browse files
committed
fix: clean it up
1 parent 0f01037 commit 40eedab

File tree

1 file changed

+10
-44
lines changed

1 file changed

+10
-44
lines changed

.circleci/config.yml

Lines changed: 10 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,6 @@ windows_big: &windows_big
5151
default: ""
5252
working_directory: ~/snyk-docker-plugin
5353

54-
windows_medium: &windows_medium
55-
executor:
56-
name: win/server-2022
57-
shell: bash.exe
58-
size: medium
59-
version: "2023.05.1"
60-
parameters:
61-
node_version:
62-
type: string
63-
default: ""
64-
working_directory: ~/snyk-docker-plugin
65-
6654
release_defaults: &release_defaults
6755
resource_class: small
6856
docker:
@@ -120,17 +108,6 @@ commands:
120108
- run:
121109
name: Use currently installed node version
122110
command: nvm list | awk '/<< parameters.node_version >>/ {print $1}' | xargs nvm use
123-
checkout_with_cache:
124-
description: Checkout command with caching
125-
steps:
126-
- restore_cache:
127-
keys:
128-
- &source-cache source-v1-{{ .Branch }}-{{ .Revision }}
129-
- checkout
130-
- save_cache:
131-
key: *source-cache
132-
paths:
133-
- ".git"
134111

135112
jobs:
136113
security-scans:
@@ -147,32 +124,20 @@ jobs:
147124
install_lint_build:
148125
<<: *defaults
149126
steps:
150-
- checkout_with_cache
151-
- restore_cache:
152-
keys:
153-
- v2-npm-cache-{{ checksum "package.json" }}
154-
- v2-npm-cache-
155-
- setup_npm_user
156-
- run: npm ci
157-
- save_cache:
158-
key: v2-npm-cache-{{ checksum "package.json" }}
159-
paths:
160-
- ~/.npm
127+
- install_deps
128+
- attach_workspace:
129+
at: ~/snyk-docker-plugin
161130
- run:
162131
name: Lint
163132
command: npm run lint
164133
- run:
165134
name: Build
166135
command: npm run build
167-
- persist_to_workspace:
168-
root: .
169-
paths:
170-
- node_modules/
171-
- dist/
136+
172137
test:
173138
<<: *defaults
174139
steps:
175-
- checkout_with_cache
140+
- checkout
176141
- setup_remote_docker:
177142
docker_layer_caching: true
178143
- attach_workspace:
@@ -201,11 +166,11 @@ jobs:
201166
name: Install JUnit coverage reporter
202167
command: npm install --no-save jest-junit
203168
- run:
204-
name: Run Windows tests in parallel
169+
name: Run Windows tests
205170
command: npm run test-jest-windows --reporters=default --reporters=jest-junit
206171
environment:
207172
JEST_JUNIT_OUTPUT_DIR: './reports/junit'
208-
JEST_JUNIT_ADD_FILE_ATTRIBUTE: 'true' # We need this to make --split-by=timings work
173+
JEST_JUNIT_ADD_FILE_ATTRIBUTE: 'true'
209174
- store_test_results:
210175
path: reports
211176
test_jest_windows_no_docker:
@@ -222,17 +187,18 @@ jobs:
222187
name: Install JUnit coverage reporter
223188
command: npm install --no-save jest-junit
224189
- run:
225-
name: Run Windows tests in parallel
190+
name: Run Windows tests
226191
command: npm run test-jest-windows --reporters=default --reporters=jest-junit
227192
environment:
228193
JEST_JUNIT_OUTPUT_DIR: './reports/junit'
229-
JEST_JUNIT_ADD_FILE_ATTRIBUTE: 'true' # We need this to make --split-by=timings work
194+
JEST_JUNIT_ADD_FILE_ATTRIBUTE: 'true'
230195
- store_test_results:
231196
path: reports
232197
build_cli:
233198
<<: *defaults
234199
resource_class: medium
235200
steps:
201+
- setup_remote_docker
236202
- checkout_and_merge
237203
- run:
238204
name: Setup NPM credentials

0 commit comments

Comments
 (0)