Skip to content

Commit 050b1d8

Browse files
Merge branch 'develop' into mschile/chrome_for_testing
2 parents 32adf6e + 53d47cf commit 050b1d8

File tree

9 files changed

+68
-12
lines changed

9 files changed

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

.circleci/workflows.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ mainBuildFilters: &mainBuildFilters
3131
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
3232
- 'update-v8-snapshot-cache-on-develop'
3333
- 'mschile/chrome_for_testing'
34+
- 'publish-binary'
3435

3536
# usually we don't build Mac app - it takes a long time
3637
# but sometimes we want to really confirm we are doing the right thing
@@ -1771,7 +1772,7 @@ jobs:
17711772
PLATFORM: linux
17721773
machine:
17731774
# using `machine` gives us a Linux VM that can run Docker
1774-
image: ubuntu-2004:202111-02
1775+
image: ubuntu-2004:2023.07.1
17751776
docker_layer_caching: true
17761777
resource_class: medium
17771778
steps:

browser-versions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"chrome:beta": "132.0.6834.32",
2+
"chrome:beta": "132.0.6834.46",
33
"chrome:stable": "131.0.6778.139",
44
"chrome:minimum": "64.0.3282.0"
55
}

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
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4252,5 +4252,5 @@
42524252
"./tooling/v8-snapshot/cache/linux/snapshot-entry.js"
42534253
],
42544254
"deferredHashFile": "yarn.lock",
4255-
"deferredHash": "2e76ee3eb48ec47a4627a4c7d5f39cbf8586601c4fca32b250efef671d7016c1"
4255+
"deferredHash": "ca5ac2cd877d4a2d2614f8a49a04badcce7f12a1f9962d6f1dbdebe4aaa797ff"
42564256
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4252,5 +4252,5 @@
42524252
"./tooling/v8-snapshot/cache/win32/snapshot-entry.js"
42534253
],
42544254
"deferredHashFile": "yarn.lock",
4255-
"deferredHash": "8c57b8f85b74c4d3743037fb216da9018cb7e3d8f510e6c0db0468ede2a35437"
4255+
"deferredHash": "7fcd9f681310aeb62da4137d956aa8b73597c9f8aa4e1c34192ca08caef2cb72"
42564256
}

yarn.lock

+59-4
Original file line numberDiff line numberDiff line change
@@ -22254,7 +22254,7 @@ [email protected]:
2225422254
resolved "https://registry.npmjs.org/mobx/-/mobx-6.13.5.tgz#957d9df88c7f8b4baa7c6f8bdcb6d68b432a6ed5"
2225522255
integrity sha512-/HTWzW2s8J1Gqt+WmUj5Y0mddZk+LInejADc79NJadrWla3rHzmRHki/mnEUH1AvOmbNTZ1BRbKxr8DSgfdjMA==
2225622256

22257-
22257+
"mocha-7.0.1@npm:[email protected]":
2225822258
version "7.0.1"
2225922259
resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce"
2226022260
integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==
@@ -22371,6 +22371,36 @@ [email protected]:
2237122371
yargs-parser "13.1.1"
2237222372
yargs-unparser "1.6.0"
2237322373

22374+
22375+
version "7.0.1"
22376+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce"
22377+
integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==
22378+
dependencies:
22379+
ansi-colors "3.2.3"
22380+
browser-stdout "1.3.1"
22381+
chokidar "3.3.0"
22382+
debug "3.2.6"
22383+
diff "3.5.0"
22384+
escape-string-regexp "1.0.5"
22385+
find-up "3.0.0"
22386+
glob "7.1.3"
22387+
growl "1.10.5"
22388+
he "1.2.0"
22389+
js-yaml "3.13.1"
22390+
log-symbols "2.2.0"
22391+
minimatch "3.0.4"
22392+
mkdirp "0.5.1"
22393+
ms "2.1.1"
22394+
node-environment-flags "1.0.6"
22395+
object.assign "4.1.0"
22396+
strip-json-comments "2.0.1"
22397+
supports-color "6.0.0"
22398+
which "1.3.1"
22399+
wide-align "1.1.3"
22400+
yargs "13.3.0"
22401+
yargs-parser "13.1.1"
22402+
yargs-unparser "1.6.0"
22403+
2237422404
2237522405
version "7.1.0"
2237622406
resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.0.tgz#c784f579ad0904d29229ad6cb1e2514e4db7d249"
@@ -29130,7 +29160,7 @@ string-template@~0.2.1:
2913029160
resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
2913129161
integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
2913229162

29133-
"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
29163+
"string-width-cjs@npm:string-width@^4.2.0":
2913429164
version "4.2.3"
2913529165
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
2913629166
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -29156,6 +29186,15 @@ string-width@^1.0.1, string-width@^1.0.2:
2915629186
is-fullwidth-code-point "^2.0.0"
2915729187
strip-ansi "^4.0.0"
2915829188

29189+
"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
29190+
version "4.2.3"
29191+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
29192+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
29193+
dependencies:
29194+
emoji-regex "^8.0.0"
29195+
is-fullwidth-code-point "^3.0.0"
29196+
strip-ansi "^6.0.1"
29197+
2915929198
string-width@^3.0.0, string-width@^3.1.0:
2916029199
version "3.1.0"
2916129200
resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -29257,7 +29296,7 @@ stringify-object@^3.0.0, stringify-object@^3.3.0:
2925729296
is-obj "^1.0.1"
2925829297
is-regexp "^1.0.0"
2925929298

29260-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", [email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
29299+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
2926129300
version "6.0.1"
2926229301
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
2926329302
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -29278,6 +29317,13 @@ [email protected], strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
2927829317
dependencies:
2927929318
ansi-regex "^4.1.0"
2928029319

29320+
[email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
29321+
version "6.0.1"
29322+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
29323+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
29324+
dependencies:
29325+
ansi-regex "^5.0.1"
29326+
2928129327
strip-ansi@^3.0.0, strip-ansi@^3.0.1:
2928229328
version "3.0.1"
2928329329
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -32287,7 +32333,7 @@ [email protected]:
3228732333
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
3228832334
integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
3228932335

32290-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
32336+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
3229132337
version "7.0.0"
3229232338
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
3229332339
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -32330,6 +32376,15 @@ wrap-ansi@^6.2.0:
3233032376
string-width "^4.1.0"
3233132377
strip-ansi "^6.0.0"
3233232378

32379+
wrap-ansi@^7.0.0:
32380+
version "7.0.0"
32381+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
32382+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
32383+
dependencies:
32384+
ansi-styles "^4.0.0"
32385+
string-width "^4.1.0"
32386+
strip-ansi "^6.0.0"
32387+
3233332388
wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
3233432389
version "8.1.0"
3233532390
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)