Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: renovate semantic types and percy ci updates #25651

Merged
merged 6 commits into from
Feb 1, 2023
Merged

chore: renovate semantic types and percy ci updates #25651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6990d18
chore: update renovate semantic type
emilyrohrbough Jan 31, 2023
00a7603
Merge branch 'develop' into update-renovate
emilyrohrbough Jan 31, 2023
eefb31e
only finalize when the jobs pass otherwise you can never get a green …
emilyrohrbough Jan 31, 2023
82ce62d
Apply suggestions from code review
emilyrohrbough Jan 31, 2023
a537291
update changelog entry to match docs repo
emilyrohrbough Jan 31, 2023
d30f42f
Merge branch 'update-renovate' of https://github.com/cypress-io/cypre…
emilyrohrbough Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
19 changes: 17 additions & 2 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": [
"config:base"
],
"automerge": true,
"automerge": false,
"major": {
"automerge": false
},
Expand All @@ -23,5 +23,20 @@
"schedule": [
"before 3am on the first day of the month"
],
"dependencyDashboardApproval": true
"dependencyDashboardApproval": true,
"packageRules": [
{
"matchPackagePatterns": [
"*"
],
"semanticCommitType": "chore"
},
{
"matchDepTypes": [
"dependencies",
"require"
],
"semanticCommitType": "dependency"
}
]
}
6 changes: 1 addition & 5 deletions scripts/wait-on-circle-jobs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => {
Expand Down Expand Up @@ -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)
}
Expand Down