From 0b20cc43cbe5a3f173669f02071f9f844292729d Mon Sep 17 00:00:00 2001
From: Ravi Jayaramappa <ravi.jayaramappa@salesforce.com>
Date: Mon, 25 Nov 2024 11:49:18 -0800
Subject: [PATCH 1/2] feat: new minor release for spring25(254/patch) branch
 @W-17311538@

---
 .github/workflows/create-github-release.yml | 1 +
 .github/workflows/onRelease.yml             | 3 ++-
 .github/workflows/test.yml                  | 2 +-
 .github/workflows/validate-pr.yml           | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/create-github-release.yml b/.github/workflows/create-github-release.yml
index 0b744c0f..1a3780e7 100644
--- a/.github/workflows/create-github-release.yml
+++ b/.github/workflows/create-github-release.yml
@@ -6,6 +6,7 @@ on:
       - main
       - prerelease/**
       - 252-patch
+      - 254-patch
     tags-ignore:
       - '*'
   workflow_dispatch:
diff --git a/.github/workflows/onRelease.yml b/.github/workflows/onRelease.yml
index b1a105ef..da055536 100644
--- a/.github/workflows/onRelease.yml
+++ b/.github/workflows/onRelease.yml
@@ -47,7 +47,8 @@ jobs:
     with:
       #ctc: true
       sign: true
-      tag: ${{ needs.getDistTag.outputs.tag || (needs.getMajorVersion.outputs.major == '1') && 'latest' || 'next' }}
+      # At CLCO, the new patch branch's version will be released as 'prerelease'. After R2b, delete the logic below for 'latest' and update 'prerelease' candidate to 'latest'
+      tag: ${{ needs.getDistTag.outputs.tag || (needs.getMajorVersion.outputs.major == '1' && 'latest') || (needs.getMajorVersion.outputs.major == '2' && 'prerelease') ||'next' }}
       githubTag: ${{ github.event.release.tag_name || inputs.tag }}
       nodeVersion: 20.18.0
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f09db51d..b2d448df 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,7 @@
 name: tests
 on:
   push:
-    branches-ignore: [main, 252-patch]
+    branches-ignore: [main, 252-patch, 254-patch]
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml
index adfafbdf..4fcb617b 100644
--- a/.github/workflows/validate-pr.yml
+++ b/.github/workflows/validate-pr.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     types: [opened, reopened, edited]
     # only applies to PRs that want to merge to main
-    branches: [main, 252-patch]
+    branches: [main, 252-patch, 254-patch]
 
 jobs:
   pr-validation:

From 4f5bdca13ba271db6d278fae39630364b457c22a Mon Sep 17 00:00:00 2001
From: Ravi Jayaramappa <ravi.jayaramappa@salesforce.com>
Date: Mon, 25 Nov 2024 11:58:55 -0800
Subject: [PATCH 2/2] fix: update API version and tag to match branching

---
 package.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 53285e02..054dd3e1 100644
--- a/package.json
+++ b/package.json
@@ -219,7 +219,7 @@
   "apiVersionMetadata": {
     "comment": "Refer to ApiVersionMetadata in orgUtils.ts for details",
     "target": {
-      "versionNumber": "63.0",
+      "versionNumber": "64.0",
       "matchingDevServerVersion": "^11.1.0"
     },
     "versionToTagMappings": [
@@ -229,6 +229,10 @@
       },
       {
         "versionNumber": "63.0",
+        "tagName": "prerelease"
+      },
+      {
+        "versionNumber": "64.0",
         "tagName": "next"
       }
     ]