Skip to content

Commit 4cebdeb

Browse files
Merge branch 'develop' into update-v8-snapshot-cache-on-develop-linux
2 parents e84775d + b339786 commit 4cebdeb

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

.circleci/cache-version.txt

+1-1
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-
11-5-24
3+
12-11-24

.circleci/workflows.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mainBuildFilters: &mainBuildFilters
3030
- /^release\/\d+\.\d+\.\d+$/
3131
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
3232
- 'update-v8-snapshot-cache-on-develop'
33-
- 'chore/update_reporter_mobx'
33+
- 'renovate/yarn-1.x'
3434
- 'publish-binary'
3535

3636
# usually we don't build Mac app - it takes a long time
@@ -42,7 +42,7 @@ macWorkflowFilters: &darwin-workflow-filters
4242
- equal: [ develop, << pipeline.git.branch >> ]
4343
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
4444
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
45-
- equal: [ 'ryanm/experiment/esm', << pipeline.git.branch >> ]
45+
- equal: [ 'renovate/yarn-1.x', << pipeline.git.branch >> ]
4646
- matches:
4747
pattern: /^release\/\d+\.\d+\.\d+$/
4848
value: << pipeline.git.branch >>
@@ -53,7 +53,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
5353
- equal: [ develop, << pipeline.git.branch >> ]
5454
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
5555
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
56-
- equal: [ 'chore/update_reporter_mobx', << pipeline.git.branch >> ]
56+
- equal: [ 'renovate/yarn-1.x', << pipeline.git.branch >> ]
5757
- matches:
5858
pattern: /^release\/\d+\.\d+\.\d+$/
5959
value: << pipeline.git.branch >>
@@ -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: [ 'chore/update_reporter_mobx', << pipeline.git.branch >> ]
79+
- equal: [ 'renovate/yarn-1.x', << pipeline.git.branch >> ]
8080
- matches:
8181
pattern: /^release\/\d+\.\d+\.\d+$/
8282
value: << pipeline.git.branch >>
@@ -1772,7 +1772,7 @@ jobs:
17721772
PLATFORM: linux
17731773
machine:
17741774
# using `machine` gives us a Linux VM that can run Docker
1775-
image: ubuntu-2004:202111-02
1775+
image: ubuntu-2004:2023.07.1
17761776
docker_layer_caching: true
17771777
resource_class: medium
17781778
steps:

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
},
213213
"engines": {
214214
"node": ">=18.17.0",
215-
"yarn": ">=1.22.17"
215+
"yarn": ">=1.22.22"
216216
},
217217
"productName": "Cypress",
218218
"license": "MIT",

system-tests/lib/normalizeStdout.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export const normalizeStdout = function (str: string, options: any = {}) {
165165
// Replaces connection warning since Chrome or Firefox sometimes take longer to connect
166166
.replace(/Still waiting to connect to .+, retrying in 1 second \(attempt .+\/.+\)\n/g, '')
167167
// Replaces CDP connection error message in Firefox since Cypress will retry
168-
.replace(/Failed to spawn CDP with Firefox. Retrying.*\.\.\./, '')
168+
.replace(/Failed to spawn CDP with Firefox. Retrying.*\.\.\.\n/g, '')
169169

170170
if (options.browser === 'webkit') {
171171
// WebKit throws for lookups on undefined refs with "Can't find variable: <var>"

tooling/v8-snapshot/cache/darwin/snapshot-meta.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4249,5 +4249,5 @@
42494249
"./tooling/v8-snapshot/cache/darwin/snapshot-entry.js"
42504250
],
42514251
"deferredHashFile": "yarn.lock",
4252-
"deferredHash": "2e76ee3eb48ec47a4627a4c7d5f39cbf8586601c4fca32b250efef671d7016c1"
4252+
"deferredHash": "ca5ac2cd877d4a2d2614f8a49a04badcce7f12a1f9962d6f1dbdebe4aaa797ff"
42534253
}

0 commit comments

Comments
 (0)