Merge branch 'develop' into update-v8-snapshot-cache-on-develop-linux

Author: jennifer-shehane

.circleci/cache-version.txt

@@ -1,3 +1,3 @@
 # Bump this version to force CI to re-create the cache from scratch.
 
-11-5-24
+12-11-24

.circleci/workflows.yml

@@ -30,7 +30,7 @@ mainBuildFilters: &mainBuildFilters
         - /^release\/\d+\.\d+\.\d+$/
         # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
         - 'update-v8-snapshot-cache-on-develop'
-        - 'chore/update_reporter_mobx'
+        - 'renovate/yarn-1.x'
         - 'publish-binary'
 
 # usually we don't build Mac app - it takes a long time
@@ -42,7 +42,7 @@ macWorkflowFilters: &darwin-workflow-filters
     - equal: [ develop, << pipeline.git.branch >> ]
     # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
     - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-    - equal: [ 'ryanm/experiment/esm', << pipeline.git.branch >> ]
+    - equal: [ 'renovate/yarn-1.x', << pipeline.git.branch >> ]
     - matches:
         pattern: /^release\/\d+\.\d+\.\d+$/
         value: << pipeline.git.branch >>
@@ -53,7 +53,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
     - equal: [ develop, << pipeline.git.branch >> ]
     # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
     - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-    - equal: [ 'chore/update_reporter_mobx', << pipeline.git.branch >> ]
+    - equal: [ 'renovate/yarn-1.x', << pipeline.git.branch >> ]
     - matches:
         pattern: /^release\/\d+\.\d+\.\d+$/
         value: << pipeline.git.branch >>
@@ -76,7 +76,7 @@ windowsWorkflowFilters: &windows-workflow-filters
     - equal: [ develop, << pipeline.git.branch >> ]
     # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
     - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-    - equal: [ 'chore/update_reporter_mobx', << pipeline.git.branch >> ]
+    - equal: [ 'renovate/yarn-1.x', << pipeline.git.branch >> ]
     - matches:
         pattern: /^release\/\d+\.\d+\.\d+$/
         value: << pipeline.git.branch >>
@@ -1772,7 +1772,7 @@ jobs:
       PLATFORM: linux
     machine:
       # using `machine` gives us a Linux VM that can run Docker
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:2023.07.1
       docker_layer_caching: true
     resource_class: medium
     steps:

package.json

@@ -212,7 +212,7 @@
   },
   "engines": {
     "node": ">=18.17.0",
-    "yarn": ">=1.22.17"
+    "yarn": ">=1.22.22"
   },
   "productName": "Cypress",
   "license": "MIT",

system-tests/lib/normalizeStdout.ts

@@ -165,7 +165,7 @@ export const normalizeStdout = function (str: string, options: any = {}) {
   // Replaces connection warning since Chrome or Firefox sometimes take longer to connect
   .replace(/Still waiting to connect to .+, retrying in 1 second \(attempt .+\/.+\)\n/g, '')
   // Replaces CDP connection error message in Firefox since Cypress will retry
-  .replace(/Failed to spawn CDP with Firefox. Retrying.*\.\.\./, '')
+  .replace(/Failed to spawn CDP with Firefox. Retrying.*\.\.\.\n/g, '')
 
   if (options.browser === 'webkit') {
     // WebKit throws for lookups on undefined refs with "Can't find variable: <var>"

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

@@ -4249,5 +4249,5 @@
     "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "2e76ee3eb48ec47a4627a4c7d5f39cbf8586601c4fca32b250efef671d7016c1"
+  "deferredHash": "ca5ac2cd877d4a2d2614f8a49a04badcce7f12a1f9962d6f1dbdebe4aaa797ff"
 }