From ed8987dea79e49eee38b0bafe567bd7c4857213a Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Fri, 8 Aug 2025 17:03:17 -0400 Subject: [PATCH] chore: clean up develop after release/15.0.0 merge (#32189) --- .circleci/cache-version.txt | 2 +- cli/CHANGELOG.md | 2 +- packages/launchpad/src/welcome/MajorVersionWelcome.cy.tsx | 6 +++--- packages/launchpad/src/welcome/MajorVersionWelcome.vue | 2 +- scripts/binary/trigger-publish-binary-pipeline.js | 2 -- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt index 2708f05df0..a9991ea23c 100644 --- a/.circleci/cache-version.txt +++ b/.circleci/cache-version.txt @@ -1,2 +1,2 @@ # Bump this version to force CI to re-create the cache from scratch. -7-16-2025-cy-15 +8-7-2025 diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 3b8f7d7a13..aaa1631d61 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -1,7 +1,7 @@ ## 15.0.0 -_Released 07/29/2025 (PENDING)_ +_Released 08/12/2025 (PENDING)_ **Breaking Changes:** diff --git a/packages/launchpad/src/welcome/MajorVersionWelcome.cy.tsx b/packages/launchpad/src/welcome/MajorVersionWelcome.cy.tsx index e1ced6cafd..cd30899903 100644 --- a/packages/launchpad/src/welcome/MajorVersionWelcome.cy.tsx +++ b/packages/launchpad/src/welcome/MajorVersionWelcome.cy.tsx @@ -36,17 +36,17 @@ describe('', { viewportWidth: 1280, viewportHeight: 1400 }) it('renders correct time for releases and overflows correctly', () => { - cy.clock(Date.UTC(2025, 6, 29)) + cy.clock(Date.UTC(2025, 7, 13)) cy.mount() cy.contains('15.0.0 Released just now') - cy.contains('14.0.0 Released 6 months ago') + cy.contains('14.0.0 Released 7 months ago') cy.contains('13.0.0 Released 2 years ago') cy.contains('12.0.0 Released 3 years ago') cy.tick(interval('1 minute')) cy.contains('15.0.0 Released 1 minute ago') cy.tick(interval('1 month')) cy.contains('15.0.0 Released last month') - cy.contains('14.0.0 Released 7 months ago') + cy.contains('14.0.0 Released 8 months ago') cy.viewport(1280, 500) diff --git a/packages/launchpad/src/welcome/MajorVersionWelcome.vue b/packages/launchpad/src/welcome/MajorVersionWelcome.vue index f409462e53..dc429fe5d8 100644 --- a/packages/launchpad/src/welcome/MajorVersionWelcome.vue +++ b/packages/launchpad/src/welcome/MajorVersionWelcome.vue @@ -192,7 +192,7 @@ const versionReleaseDates = computed(() => { '12': useTimeAgo(Date.UTC(2022, 11, 6)).value, '13': useTimeAgo(Date.UTC(2023, 7, 29)).value, '14': useTimeAgo(Date.UTC(2025, 0, 16)).value, - '15': useTimeAgo(Date.UTC(2025, 6, 29)).value, + '15': useTimeAgo(Date.UTC(2025, 7, 13)).value, } }) diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index c65586ff79..4c4ed43db2 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -10,14 +10,12 @@ const { getNextVersionForBinary } = require('../get-next-version') const { nextVersion } = await getNextVersionForBinary() const body = JSON.stringify({ - branch: 'release/15.0.0', parameters: { temp_dir: os.tmpdir(), sha: process.env.CIRCLE_SHA1, job_name: process.env.CIRCLE_JOB, triggered_workflow_id: process.env.CIRCLE_WORKFLOW_ID, triggered_job_url: process.env.CIRCLE_BUILD_URL, - branch: 'release/15.0.0', should_persist_artifacts: Boolean(process.env.SHOULD_PERSIST_ARTIFACTS), binary_version: nextVersion, },