diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index f1b4bbc4d267..0795d3087eba 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -1,25 +1,23 @@ ## 12.5.0 -_Released 01/31/2023 (PENDING)_ +_Released 01/31/2023_ **Features:** -- Easily debug failed CI test runs right from your local Cypress app with the new Debug page, powered by Cypress Cloud. For more details, see the [Debug documentation](https://on.cypress.io/debug-page). Addressed in [#25488](https://github.com/cypress-io/cypress/pull/25488). +- Easily debug failed CI test runs recorded to the Cypress Cloud from your local Cypress app with the new Debug page. Please leave any feedback [here](https://github.com/cypress-io/cypress/discussions/25649). Your feedback will help us make decisions to improve the Debug experience. For more details, see [our blog post](https://on.cypress.io/debug-page-release). Addressed in [#25488](https://github.com/cypress-io/cypress/pull/25488). -**Bugfixes:** +**Performance:** -- 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). +- Improved memory consumption in `run` mode by removing reporter logs for successful tests. Fixes [#25230](https://github.com/cypress-io/cypress/issues/25230). -**Performance:** +**Bugfixes:** -- Improved memory consumption in `run` mode by removing reporter logs for successful tests. - Fixes [#25230](https://github.com/cypress-io/cypress/issues/25230). +- 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:** + -- 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. +- 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). ## 12.4.1 diff --git a/package.json b/package.json index a4d138bf7128..9eb918e37bcf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cypress", - "version": "12.4.1", + "version": "12.5.0", "description": "Cypress is a next generation front end testing tool built for the modern web", "private": true, "scripts": { diff --git a/scripts/semantic-commits/parse-changelog.js b/scripts/semantic-commits/parse-changelog.js index 786b61c62f70..f2bf54e90193 100644 --- a/scripts/semantic-commits/parse-changelog.js +++ b/scripts/semantic-commits/parse-changelog.js @@ -41,7 +41,7 @@ async function parseChangelog (pendingRelease = true) { nextKnownLineBreak = index + 1 if (pendingRelease && !/_Released \d+\/\d+\/\d+ \(PENDING\)_/.test(line)) { throw new Error(`Expected line number ${index + 1} to include "_Released xx/xx/xxxx (PENDING)_"`) - } else if (!pendingRelease && !/_Released \d+\/\d+\/\d+__/.test(line)) { + } else if (!pendingRelease && !/_Released \d+\/\d+\/\d+_/.test(line)) { throw new Error(`Expected line number ${index + 1} to include "_Released xx/xx/xxxx_"`) } @@ -51,7 +51,7 @@ async function parseChangelog (pendingRelease = true) { throw new Error(`Expected line number ${index + 1} to be a line break`) } } else { - const result = /\*\*.+?:\*\*/.exec(line) + const result = /^\*\*.+?:\*\*/.exec(line) if (currentSection === '' && !result) { throw new Error(`Expected line number ${index + 1} to be a valid section header. Received ${line}. Expected one of ...\n - ${userFacingSections.join('\n - ')}`) diff --git a/scripts/semantic-commits/validate-binary-changelog.js b/scripts/semantic-commits/validate-binary-changelog.js index a4fd625d3c0d..06e00b5879b1 100644 --- a/scripts/semantic-commits/validate-binary-changelog.js +++ b/scripts/semantic-commits/validate-binary-changelog.js @@ -6,13 +6,12 @@ const checkedInBinaryVersion = require('../../package.json').version const changelog = async () => { const latestReleaseInfo = await getCurrentReleaseData() + let hasVersionBump = checkedInBinaryVersion !== latestReleaseInfo.version if (process.env.CIRCLECI) { console.log({ checkedInBinaryVersion }) - const hasVersionBump = checkedInBinaryVersion !== latestReleaseInfo.version - - if (process.env.CIRCLE_BRANCH !== 'develop' && process.env.CIRCLE_BRANCH !== 'emily/changelog2' && !/^release\/\d+\.\d+\.\d+$/.test(process.env.CIRCLE_BRANCH) && !hasVersionBump) { + if (process.env.CIRCLE_BRANCH !== 'develop' && process.env.CIRCLE_BRANCH !== 'release-12.5.0' && !/^release\/\d+\.\d+\.\d+$/.test(process.env.CIRCLE_BRANCH) && !hasVersionBump) { console.log('Only verify the entire changelog for develop, a release branch or any branch that bumped to the Cypress version in the package.json.') return @@ -30,6 +29,7 @@ const changelog = async () => { return validateChangelog({ nextVersion, changedFiles, + pendingRelease: !hasVersionBump, commits, }) } diff --git a/scripts/semantic-commits/validate-changelog.js b/scripts/semantic-commits/validate-changelog.js index 63334445fc49..fef8ea1b4f14 100644 --- a/scripts/semantic-commits/validate-changelog.js +++ b/scripts/semantic-commits/validate-changelog.js @@ -106,7 +106,7 @@ const _handleErrors = (errors) => { * Determines if the Cypress changelog has the correct next version and changelog entires given the provided * list of commits. */ -async function validateChangelog ({ changedFiles, nextVersion, commits }) { +async function validateChangelog ({ changedFiles, nextVersion, pendingRelease, commits }) { const hasUserFacingCommits = commits.some(({ semanticType }) => hasUserFacingChange(semanticType)) if (!hasUserFacingCommits) { @@ -138,7 +138,7 @@ async function validateChangelog ({ changedFiles, nextVersion, commits }) { } } - const changelog = await parseChangelog() + const changelog = await parseChangelog(pendingRelease) if (nextVersion && !changelog.version === `## ${nextVersion}`) { errors.push(`The changelog version does not contain the next Cypress version of ${nextVersion}. If the changelog version is correct, please correct the pull request title to correctly reflect the change being made.`)