Skip to content

Commit ed8987d

Browse files
authored
chore: clean up develop after release/15.0.0 merge (#32189)
1 parent 666e088 commit ed8987d

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

.circleci/cache-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Bump this version to force CI to re-create the cache from scratch.
2-
7-16-2025-cy-15
2+
8-7-2025

cli/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
22
## 15.0.0
33

4-
_Released 07/29/2025 (PENDING)_
4+
_Released 08/12/2025 (PENDING)_
55

66
**Breaking Changes:**
77

packages/launchpad/src/welcome/MajorVersionWelcome.cy.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ describe('<MajorVersionWelcome />', { viewportWidth: 1280, viewportHeight: 1400
3636
})
3737

3838
it('renders correct time for releases and overflows correctly', () => {
39-
cy.clock(Date.UTC(2025, 6, 29))
39+
cy.clock(Date.UTC(2025, 7, 13))
4040
cy.mount(<MajorVersionWelcome />)
4141
cy.contains('15.0.0 Released just now')
42-
cy.contains('14.0.0 Released 6 months ago')
42+
cy.contains('14.0.0 Released 7 months ago')
4343
cy.contains('13.0.0 Released 2 years ago')
4444
cy.contains('12.0.0 Released 3 years ago')
4545
cy.tick(interval('1 minute'))
4646
cy.contains('15.0.0 Released 1 minute ago')
4747
cy.tick(interval('1 month'))
4848
cy.contains('15.0.0 Released last month')
49-
cy.contains('14.0.0 Released 7 months ago')
49+
cy.contains('14.0.0 Released 8 months ago')
5050

5151
cy.viewport(1280, 500)
5252

packages/launchpad/src/welcome/MajorVersionWelcome.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ const versionReleaseDates = computed(() => {
192192
'12': useTimeAgo(Date.UTC(2022, 11, 6)).value,
193193
'13': useTimeAgo(Date.UTC(2023, 7, 29)).value,
194194
'14': useTimeAgo(Date.UTC(2025, 0, 16)).value,
195-
'15': useTimeAgo(Date.UTC(2025, 6, 29)).value,
195+
'15': useTimeAgo(Date.UTC(2025, 7, 13)).value,
196196
}
197197
})
198198

scripts/binary/trigger-publish-binary-pipeline.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ const { getNextVersionForBinary } = require('../get-next-version')
1010
const { nextVersion } = await getNextVersionForBinary()
1111

1212
const body = JSON.stringify({
13-
branch: 'release/15.0.0',
1413
parameters: {
1514
temp_dir: os.tmpdir(),
1615
sha: process.env.CIRCLE_SHA1,
1716
job_name: process.env.CIRCLE_JOB,
1817
triggered_workflow_id: process.env.CIRCLE_WORKFLOW_ID,
1918
triggered_job_url: process.env.CIRCLE_BUILD_URL,
20-
branch: 'release/15.0.0',
2119
should_persist_artifacts: Boolean(process.env.SHOULD_PERSIST_ARTIFACTS),
2220
binary_version: nextVersion,
2321
},

0 commit comments

Comments
 (0)