From 6990d18c2e822da3931bc8d313a6d6d181f49083 Mon Sep 17 00:00:00 2001
From: Emily Rohrbough <emilyrohrbough@yahoo.com>
Date: Tue, 31 Jan 2023 13:16:36 -0600
Subject: [PATCH 1/4] chore: update renovate semantic type

---
 renovate.json | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/renovate.json b/renovate.json
index 78f83499e1eb..0cea62597db8 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,7 +2,7 @@
   "extends": [
     "config:base"
   ],
-  "automerge": true,
+  "automerge": false,
   "major": {
     "automerge": false
   },
@@ -23,5 +23,19 @@
   "schedule": [
     "before 3am on the first day of the month"
   ],
-  "dependencyDashboardApproval": true
+  "dependencyDashboardApproval": true,
+  "packageRules": [
+    {
+      "matchPackagePatterns": [
+        "devDependencies"
+      ],
+      "semanticCommitType": "chore"
+    },
+    {
+      "matchDepTypes": [
+        "dependencies"
+      ],
+      "semanticCommitType": "dependency"
+    }
+  ]
 }

From eefb31e44a64016589e736c1d1202b754f331f0b Mon Sep 17 00:00:00 2001
From: Emily Rohrbough <emilyrohrbough@yahoo.com>
Date: Tue, 31 Jan 2023 16:04:45 -0600
Subject: [PATCH 2/4] only finalize when the jobs pass otherwise you can never
 get a green build on develop

---
 scripts/wait-on-circle-jobs.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/wait-on-circle-jobs.js b/scripts/wait-on-circle-jobs.js
index 1c6740f65348..0a2175af20d4 100644
--- a/scripts/wait-on-circle-jobs.js
+++ b/scripts/wait-on-circle-jobs.js
@@ -15,10 +15,6 @@ const jobName = process.env.CIRCLE_JOB || 'wait-on-circle-jobs'
 
 const workflowId = process.env.CIRCLE_WORKFLOW_ID
 
-const branchesToAlwaysFinalize = ['develop']
-
-const requireAllJobsToPass = !branchesToAlwaysFinalize.includes(process.env.CIRCLE_BRANCH)
-
 const getAuth = () => `${process.env.CIRCLE_TOKEN}:`
 
 const verifyCI = () => {
@@ -86,7 +82,7 @@ const waitForAllJobs = async (jobNames, workflowId) => {
   const runningJobNames = _.map(runningJobs, 'name')
   const failedJobNames = _.map(failedJobs, 'name')
 
-  if (requireAllJobsToPass && _.intersection(jobNames, failedJobNames).length) {
+  if (_.intersection(jobNames, failedJobNames).length) {
     console.error('At least one failing job has prevented percy-finalize from running', failedJobs)
     process.exit(1)
   }

From 82ce62d68f7a7e31797604dbdf6ddeaf10a67f9b Mon Sep 17 00:00:00 2001
From: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
Date: Tue, 31 Jan 2023 16:18:30 -0600
Subject: [PATCH 3/4] Apply suggestions from code review

---
 renovate.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/renovate.json b/renovate.json
index 0cea62597db8..d1c9a2b10224 100644
--- a/renovate.json
+++ b/renovate.json
@@ -27,13 +27,14 @@
   "packageRules": [
     {
       "matchPackagePatterns": [
-        "devDependencies"
+        "*"
       ],
       "semanticCommitType": "chore"
     },
     {
       "matchDepTypes": [
-        "dependencies"
+        "dependencies",
+        "require"
       ],
       "semanticCommitType": "dependency"
     }

From a537291d276d7e3a2574365a0f43668d4e7d8f57 Mon Sep 17 00:00:00 2001
From: Emily Rohrbough <emilyrohrbough@yahoo.com>
Date: Tue, 31 Jan 2023 16:22:07 -0600
Subject: [PATCH 4/4] update changelog entry to match docs repo

---
 cli/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
index 0795d3087eba..7a7b93ea7ec7 100644
--- a/cli/CHANGELOG.md
+++ b/cli/CHANGELOG.md
@@ -15,9 +15,9 @@ _Released 01/31/2023_
 
 - Fixed an issue where alternative Microsoft Edge Beta, Canary, and Dev binary versions were not being discovered by Cypress. Fixes [#25455](https://github.com/cypress-io/cypress/issues/25455).
 
-<!-- **Dependency Updates:** // this was committed with 'fix' instead of 'dependency' -->
+**Dependency Updates:**
 
-- Upgraded [`underscore.string`](https://github.com/esamattis/underscore.string/blob/HEAD/CHANGELOG.markdown) from `3.3.5` to `3.3.6` to reference rebuilt assets after security patch to fix regular expression DDOS exploit. Fixed in [#25574](https://github.com/cypress-io/cypress/pull/25574).
+- Upgraded [`underscore.string`](https://github.com/esamattis/underscore.string/blob/HEAD/CHANGELOG.markdown) from `3.3.5` to `3.3.6` to reference rebuilt assets after security patch to fix regular expression DDOS exploit. Addressed in [#25574](https://github.com/cypress-io/cypress/pull/25574).
 
 ## 12.4.1