Skip to content

Commit 1fb16b0

Browse files
flotwigflotwig
authored
chore: fix cache keys to include PLATFORM (#20279)
* chore: fix cache keys to include PLATFORM * build this branch * try using platform_key
1 parent 65ea8f7 commit 1fb16b0

File tree

1 file changed

+31
-18
lines changed

1 file changed

+31
-18
lines changed

‎circle.yml

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ mainBuildFilters: &mainBuildFilters
2929
only:
3030
- develop
3131
- 10.0-release
32-
- other-projects-cleanup
32+
- fix-darwin-win32-node-modules-install
3333

3434
# usually we don't build Mac app - it takes a long time
3535
# but sometimes we want to really confirm we are doing the right thing
@@ -38,7 +38,7 @@ macWorkflowFilters: &mac-workflow-filters
3838
when:
3939
or:
4040
- equal: [ develop, << pipeline.git.branch >> ]
41-
- equal: [ renovate/cypress-request-2.x, << pipeline.git.branch >> ]
41+
- equal: [ fix-darwin-win32-node-modules-install, << pipeline.git.branch >> ]
4242
- matches:
4343
pattern: "-release$"
4444
value: << pipeline.git.branch >>
@@ -48,7 +48,7 @@ windowsWorkflowFilters: &windows-workflow-filters
4848
or:
4949
- equal: [ master, << pipeline.git.branch >> ]
5050
- equal: [ develop, << pipeline.git.branch >> ]
51-
- equal: [ test-binary-downstream-windows, << pipeline.git.branch >> ]
51+
- equal: [ fix-darwin-win32-node-modules-install, << pipeline.git.branch >> ]
5252
- matches:
5353
pattern: "-release$"
5454
value: << pipeline.git.branch >>
@@ -167,9 +167,12 @@ commands:
167167
- run:
168168
name: Generate Circle Cache Key
169169
command: node scripts/circle-cache.js --action cacheKey > circle_cache_key
170+
- run:
171+
name: Generate platform key
172+
command: echo $PLATFORM > platform_key
170173
- restore_cache:
171174
name: Restore cache state, to check for known modules cache existence
172-
key: v{{ .Environment.CACHE_VERSION }}-node-modules-cache-{{ checksum "circle_cache_key" }}
175+
key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-node-modules-cache-{{ checksum "circle_cache_key" }}
173176
- run:
174177
name: Move node_modules back from /tmp
175178
command: |
@@ -190,22 +193,28 @@ commands:
190193
- run:
191194
name: Generate Circle Cache key for system tests
192195
command: ./system-tests/scripts/cache-key.sh > system_tests_cache_key
196+
- run:
197+
name: Generate platform key
198+
command: echo $PLATFORM > platform_key
193199
- restore_cache:
194200
name: Restore system tests node_modules cache
195201
keys:
196-
- v{{ .Environment.CACHE_VERSION }}-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
197-
- v{{ .Environment.CACHE_VERSION }}-system-tests-projects-node-modules-cache-
202+
- v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
203+
- v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-
198204

199205
update_cached_system_tests_deps:
200206
description: 'Update the cached node_modules for projects in "system-tests/projects/**"'
201207
steps:
202208
- run:
203209
name: Generate Circle Cache key for system tests
204210
command: ./system-tests/scripts/cache-key.sh > system_tests_cache_key
211+
- run:
212+
name: Generate platform key
213+
command: echo $PLATFORM > platform_key
205214
- restore_cache:
206215
name: Restore cache state, to check for known modules cache existence
207216
keys:
208-
- v{{ .Environment.CACHE_VERSION }}-system-tests-projects-node-modules-cache-state-{{ checksum "system_tests_cache_key" }}
217+
- v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-state-{{ checksum "system_tests_cache_key" }}
209218
- run:
210219
name: Send root honeycomb event for this CI build
211220
command: cd system-tests/scripts && node ./send-root-honecomb-event.js
@@ -219,20 +228,20 @@ commands:
219228
- restore_cache:
220229
name: Restore system tests node_modules cache
221230
keys:
222-
- v{{ .Environment.CACHE_VERSION }}-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
223-
- v{{ .Environment.CACHE_VERSION }}-system-tests-projects-node-modules-cache-
231+
- v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
232+
- v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-
224233
- run:
225234
name: Update system-tests node_modules cache
226235
command: yarn workspace @tooling/system-tests projects:yarn:install
227236
- save_cache:
228237
name: Save system tests node_modules cache
229-
key: v{{ .Environment.CACHE_VERSION }}-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
238+
key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-{{ checksum "system_tests_cache_key" }}
230239
paths:
231240
- ~/.cache/cy-system-tests-node-modules
232241
- run: touch /tmp/system_tests_node_modules_installed
233242
- save_cache:
234243
name: Save system tests node_modules cache state key
235-
key: v{{ .Environment.CACHE_VERSION }}-system-tests-projects-node-modules-cache-state-{{ checksum "system_tests_cache_key" }}
244+
key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-system-tests-projects-node-modules-cache-state-{{ checksum "system_tests_cache_key" }}
236245
paths:
237246
- /tmp/system_tests_node_modules_installed
238247

@@ -247,9 +256,12 @@ commands:
247256
- run:
248257
name: Generate Circle Cache Key
249258
command: node scripts/circle-cache.js --action cacheKey > circle_cache_key
259+
- run:
260+
name: Generate platform key
261+
command: echo $PLATFORM > platform_key
250262
- restore_cache:
251263
name: Restore cache state, to check for known modules cache existence
252-
key: v{{ .Environment.CACHE_VERSION }}-node-modules-cache-state-{{ checksum "circle_cache_key" }}
264+
key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-node-modules-cache-state-{{ checksum "circle_cache_key" }}
253265
- run:
254266
name: Bail if cache exists
255267
command: |
@@ -261,7 +273,7 @@ commands:
261273
- restore_cache:
262274
name: Restore weekly yarn cache
263275
keys:
264-
- v{{ .Environment.CACHE_VERSION }}-deps-root-weekly-{{ checksum "cache_date" }}
276+
- v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-deps-root-weekly-{{ checksum "cache_date" }}
265277
- run:
266278
name: Install Node Modules
267279
command: |
@@ -274,7 +286,7 @@ commands:
274286
steps:
275287
- save_cache:
276288
name: Saving node modules for root, cli, and all globbed workspace packages
277-
key: v{{ .Environment.CACHE_VERSION }}-node-modules-cache-{{ checksum "circle_cache_key" }}
289+
key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-node-modules-cache-{{ checksum "circle_cache_key" }}
278290
paths:
279291
- node_modules
280292
- cli/node_modules
@@ -285,18 +297,18 @@ commands:
285297
steps:
286298
- save_cache:
287299
name: Saving node modules for root, cli, and all globbed workspace packages
288-
key: v{{ .Environment.CACHE_VERSION }}-node-modules-cache-{{ checksum "circle_cache_key" }}
300+
key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-node-modules-cache-{{ checksum "circle_cache_key" }}
289301
paths:
290302
- /tmp/node_modules_cache
291303
- run: touch /tmp/node_modules_installed
292304
- save_cache:
293305
name: Saving node-modules cache state key
294-
key: v{{ .Environment.CACHE_VERSION }}-node-modules-cache-state-{{ checksum "circle_cache_key" }}
306+
key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-node-modules-cache-state-{{ checksum "circle_cache_key" }}
295307
paths:
296308
- /tmp/node_modules_installed
297309
- save_cache:
298310
name: Save weekly yarn cache
299-
key: v{{ .Environment.CACHE_VERSION }}-deps-root-weekly-{{ checksum "cache_date" }}
311+
key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-deps-root-weekly-{{ checksum "cache_date" }}
300312
paths:
301313
- ~/.yarn
302314

@@ -1185,6 +1197,7 @@ jobs:
11851197
working_directory: ~/cypress
11861198
environment:
11871199
<<: *defaultsEnvironment
1200+
PLATFORM: linux
11881201
machine:
11891202
# using `machine` gives us a Linux VM that can run Docker
11901203
image: ubuntu-2004:202111-02
@@ -1613,7 +1626,7 @@ jobs:
16131626
- run:
16141627
name: Check current branch to persist artifacts
16151628
command: |
1616-
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "other-projects-cleanup" ]]; then
1629+
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-darwin-win32-node-modules-install" ]]; then
16171630
echo "Not uploading artifacts or posting install comment for this branch."
16181631
circleci-agent step halt
16191632
fi

0 commit comments

Comments
 (0)