From 778868912f61459feef8210430dfa38947ca3420 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 24 Jul 2024 11:54:21 +0100 Subject: [PATCH 1/2] Updates following `release-2.9` branch References to `v2.9-head` will need updating when there's a rancher 2.10 build --- .github/workflows/build-and-upload-release.yaml | 2 +- shell/assets/translations/en-us.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-upload-release.yaml b/.github/workflows/build-and-upload-release.yaml index fc0d9fff998..e82f69d9f65 100644 --- a/.github/workflows/build-and-upload-release.yaml +++ b/.github/workflows/build-and-upload-release.yaml @@ -2,7 +2,7 @@ name: Build Dashboard (Release) on: push: tags: - - v2.9.* + - v2.10.* jobs: build-validation: diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml index 26aea5e2b19..b4f4b5cffdc 100644 --- a/shell/assets/translations/en-us.yaml +++ b/shell/assets/translations/en-us.yaml @@ -2955,7 +2955,7 @@ landing: cpuUsed: CPU Used memoryUsed: Memory Used seeWhatsNew: Learn more about the improvements and new capabilities in this version. - whatsNewLink: "What's new in 2.9" + whatsNewLink: "What's new in 2.10" learnMore: Learn More support: Support community: From 7ccb3be8dc8ff965439e0ccc337656dca683e9fd Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 24 Jul 2024 14:36:18 +0100 Subject: [PATCH 2/2] Make tag generic, revert 'whats new' change - tag is safe to be generic now (and not branch specific) - 'whats new' version must match the version of rancher. there's no 2.10 yet so it's still 2.9 --- .github/workflows/build-and-upload-release.yaml | 2 +- shell/assets/translations/en-us.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-upload-release.yaml b/.github/workflows/build-and-upload-release.yaml index e82f69d9f65..7f514d00fda 100644 --- a/.github/workflows/build-and-upload-release.yaml +++ b/.github/workflows/build-and-upload-release.yaml @@ -2,7 +2,7 @@ name: Build Dashboard (Release) on: push: tags: - - v2.10.* + - v2.* jobs: build-validation: diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml index b4f4b5cffdc..26aea5e2b19 100644 --- a/shell/assets/translations/en-us.yaml +++ b/shell/assets/translations/en-us.yaml @@ -2955,7 +2955,7 @@ landing: cpuUsed: CPU Used memoryUsed: Memory Used seeWhatsNew: Learn more about the improvements and new capabilities in this version. - whatsNewLink: "What's new in 2.10" + whatsNewLink: "What's new in 2.9" learnMore: Learn More support: Support community: