Skip to content

Commit 02be8e5

Browse files
authored
chore: temporarily patch windows build to install dependencies as caching is currently broken (#30350)
1 parent 619a9ab commit 02be8e5

File tree

2 files changed

+71
-2
lines changed

2 files changed

+71
-2
lines changed

.circleci/cache-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Bump this version to force CI to re-create the cache from scratch.
22

3-
09-30-24
3+
09-30-24-windows-patch-server-2022

.circleci/workflows.yml

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ windowsWorkflowFilters: &windows-workflow-filters
7676
- equal: [ develop, << pipeline.git.branch >> ]
7777
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
7878
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
79-
- equal: [ 'misc/remove_marionette_for_geckodriver', << pipeline.git.branch >> ]
79+
- equal: [ 'chore/patch_windows_build', << pipeline.git.branch >> ]
8080
- matches:
8181
pattern: /^release\/\d+\.\d+\.\d+$/
8282
value: << pipeline.git.branch >>
@@ -623,6 +623,9 @@ commands:
623623
browser:
624624
description: browser shortname to target
625625
type: string
626+
executor:
627+
description: the executor in use. Only used if Windows for workaround purposes
628+
type: executor
626629
percy:
627630
description: enable percy
628631
type: boolean
@@ -637,6 +640,16 @@ commands:
637640
default: ''
638641
steps:
639642
- restore_cached_workspace
643+
# this is a temporary work around while we wait for circle to resolve issues with packages
644+
# with an @ character in windows during save_cache.
645+
# @see https://github.com/cypress-io/cypress/issues/30343 for more details.
646+
- when:
647+
condition:
648+
equal: [ *windows-executor, << parameters.executor >> ]
649+
steps:
650+
- run:
651+
name: reinstall dependencies to work around cache issue (Windows only)
652+
command: rm -rf node_modules && yarn
640653
- windows-install-chrome:
641654
browser: <<parameters.browser>>
642655
- run:
@@ -1370,6 +1383,16 @@ jobs:
13701383
resource_class: << parameters.resource_class >>
13711384
steps:
13721385
- restore_cached_workspace
1386+
# this is a temporary work around while we wait for circle to resolve issues with packages
1387+
# with an @ character in windows during save_cache.
1388+
# @see https://github.com/cypress-io/cypress/issues/30343 for more details.
1389+
- when:
1390+
condition:
1391+
equal: [ *windows-executor, << parameters.executor >> ]
1392+
steps:
1393+
- run:
1394+
name: reinstall dependencies to work around cache issue (Windows only)
1395+
command: rm -rf node_modules && yarn
13731396
- run:
13741397
name: Top level packages
13751398
command: yarn list --depth=0 || true
@@ -1483,6 +1506,16 @@ jobs:
14831506
steps:
14841507
- restore_cached_workspace
14851508
- restore_cached_system_tests_deps
1509+
# this is a temporary work around while we wait for circle to resolve issues with packages
1510+
# with an @ character in windows during save_cache.
1511+
# @see https://github.com/cypress-io/cypress/issues/30343 for more details.
1512+
- when:
1513+
condition:
1514+
equal: [ *windows-executor, << parameters.executor >> ]
1515+
steps:
1516+
- run:
1517+
name: reinstall dependencies to work around cache issue (Windows only)
1518+
command: rm -rf node_modules && yarn
14861519
# TODO: Remove this once we switch off self-hosted M1 runners
14871520
- when:
14881521
condition:
@@ -1528,6 +1561,16 @@ jobs:
15281561
parallelism: 1
15291562
steps:
15301563
- restore_cached_workspace
1564+
# this is a temporary work around while we wait for circle to resolve issues with packages
1565+
# with an @ character in windows during save_cache.
1566+
# @see https://github.com/cypress-io/cypress/issues/30343 for more details.
1567+
- when:
1568+
condition:
1569+
equal: [ *windows-executor, << parameters.executor >> ]
1570+
steps:
1571+
- run:
1572+
name: reinstall dependencies to work around cache issue (Windows only)
1573+
command: rm -rf node_modules && yarn
15311574
- run:
15321575
name: Driver memory tests in Electron
15331576
environment:
@@ -1648,6 +1691,16 @@ jobs:
16481691
equal: [ *darwin-arm64-executor, << parameters.executor >> ]
16491692
steps:
16501693
- run: rm -f /tmp/cypress/junit/*
1694+
# this is a temporary work around while we wait for circle to resolve issues with packages
1695+
# with an @ character in windows during save_cache.
1696+
# @see https://github.com/cypress-io/cypress/issues/30343 for more details.
1697+
- when:
1698+
condition:
1699+
equal: [ *windows-executor, << parameters.executor >> ]
1700+
steps:
1701+
- run:
1702+
name: reinstall dependencies to work around cache issue (Windows only)
1703+
command: rm -rf node_modules && yarn
16511704
- run: yarn workspace @packages/server test-unit cloud/environment_spec.ts
16521705
- verify-mocha-results:
16531706
expectedResultCount: 1
@@ -1793,6 +1846,7 @@ jobs:
17931846
steps:
17941847
- run-new-ui-tests:
17951848
browser: chrome
1849+
executor: << parameters.executor >>
17961850
percy: << parameters.percy >>
17971851
package: frontend-shared
17981852
type: ct
@@ -1808,6 +1862,7 @@ jobs:
18081862
steps:
18091863
- run-new-ui-tests:
18101864
browser: chrome
1865+
executor: << parameters.executor >>
18111866
percy: << parameters.percy >>
18121867
package: launchpad
18131868
type: ct
@@ -1828,6 +1883,7 @@ jobs:
18281883
steps:
18291884
- run-new-ui-tests:
18301885
browser: chrome
1886+
executor: << parameters.executor >>
18311887
percy: << parameters.percy >>
18321888
package: launchpad
18331889
type: e2e
@@ -1846,6 +1902,7 @@ jobs:
18461902
steps:
18471903
- run-new-ui-tests:
18481904
browser: chrome
1905+
executor: << parameters.executor >>
18491906
percy: << parameters.percy >>
18501907
package: app
18511908
type: ct
@@ -1865,6 +1922,7 @@ jobs:
18651922
steps:
18661923
- run-new-ui-tests:
18671924
browser: chrome
1925+
executor: << parameters.executor >>
18681926
percy: << parameters.percy >>
18691927
package: app
18701928
type: e2e
@@ -1921,6 +1979,7 @@ jobs:
19211979
steps:
19221980
- run-new-ui-tests:
19231981
browser: chrome
1982+
executor: << parameters.executor >>
19241983
percy: << parameters.percy >>
19251984
package: reporter
19261985
type: ct
@@ -2203,6 +2262,16 @@ jobs:
22032262
resource_class: << parameters.resource_class >>
22042263
steps:
22052264
- restore_cached_workspace
2265+
# this is a temporary work around while we wait for circle to resolve issues with packages
2266+
# with an @ character in windows during save_cache.
2267+
# @see https://github.com/cypress-io/cypress/issues/30343 for more details.
2268+
- when:
2269+
condition:
2270+
equal: [ *windows-executor, << parameters.executor >> ]
2271+
steps:
2272+
- run:
2273+
name: reinstall dependencies to work around cache issue (Windows only)
2274+
command: rm -rf node_modules && yarn
22062275
- check-if-binary-exists
22072276
- build-and-package-binary
22082277
- build-cypress-npm-package:

0 commit comments

Comments
 (0)