@@ -188,24 +188,14 @@ jobs:
188188 - checkout
189189 - install_node_npm :
190190 node_version : << parameters.node_version >>
191- - run :
192- name : Configure npm cache
193- command : npm config set cache .npm-cache
194- - restore_cache :
195- keys :
196- - v1-win-dependencies-{{ checksum "package.json" }}
197- - v1-win-dependencies- # Fallback key for partial cache restoration
198- - setup_npm_user
199191
200192 # Restore Docker images from cache early
201193 - restore_cache :
202194 keys :
203195 - v1-docker-images-{{ checksum "test/windows/plugin.spec.ts" }}
204196 - v1-docker-images- # Fallback to any docker cache
205197
206- - run :
207- name : Load cached Docker images if available
208- command : .circleci/cache-python-docker.sh load
198+
209199
210200 # Run npm ci and docker pull in parallel
211201 - run :
@@ -215,7 +205,7 @@ jobs:
215205 echo "Starting Docker image pull in background..."
216206 (
217207 docker version
218- .circleci/cache-python-docker.sh pull
208+ .circleci/cache-python-docker.sh load
219209 echo $? > /tmp/docker-pull-exit-code
220210 ) &
221211 DOCKER_PID=$!
@@ -245,11 +235,10 @@ jobs:
245235
246236 echo "Both npm ci and Docker pull completed successfully!"
247237
248- - save_cache :
249- key : v1-win-dependencies-{{ checksum "package.json" }}
250- paths :
251- - node_modules
252- - .npm-cache
238+ - run :
239+ name : Pull Docker images if needed
240+ command : .circleci/cache-python-docker.sh pull
241+
253242 - run :
254243 name : Install JUnit coverage reporter
255244 command : npm install --no-save jest-junit
@@ -281,20 +270,8 @@ jobs:
281270 - checkout
282271 - install_node_npm :
283272 node_version : << parameters.node_version >>
284- - run :
285- name : Configure npm cache
286- command : npm config set cache .npm-cache
287- - restore_cache :
288- keys :
289- - v1-win-dependencies-{{ checksum "package.json" }}
290- - v1-win-dependencies- # Fallback key for partial cache restoration
291273 - setup_npm_user
292274 - run : npm ci --loglevel verbose
293- - save_cache :
294- key : v1-win-dependencies-{{ checksum "package.json" }}
295- paths :
296- - node_modules
297- - .npm-cache
298275 # make docker appear to be broken.
299276 - run : " function docker() { return 1; }"
300277 - run :
0 commit comments