From 8a83e2d8ba2ffdfe2e2c704e6febe3a2f8f46403 Mon Sep 17 00:00:00 2001
From: Ravi Jayaramappa <ravi.jayaramappa@salesforce.com>
Date: Wed, 18 Dec 2024 10:55:35 -0800
Subject: [PATCH 1/2] feat!: new minor release for spring25(254-patch) branch
 @W-17311538@ (#274)

* feat: new minor release for spring25(254/patch) branch @W-17311538@

* fix: update API version and tag to match branching
---
 .github/workflows/create-github-release.yml | 1 +
 .github/workflows/onRelease.yml             | 3 ++-
 .github/workflows/test.yml                  | 2 +-
 .github/workflows/validate-pr.yml           | 2 +-
 package.json                                | 6 +++++-
 5 files changed, 10 insertions(+), 4 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 442013a4..264c8cef 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 }}
 
     secrets: inherit
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f7057fe9..9e6cca21 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:
diff --git a/package.json b/package.json
index 98581984..c49a8294 100644
--- a/package.json
+++ b/package.json
@@ -218,7 +218,7 @@
   "apiVersionMetadata": {
     "comment": "Refer to ApiVersionMetadata in orgUtils.ts for details",
     "target": {
-      "versionNumber": "63.0",
+      "versionNumber": "64.0",
       "matchingDevServerVersion": "^11.1.0"
     },
     "versionToTagMappings": [
@@ -228,6 +228,10 @@
       },
       {
         "versionNumber": "63.0",
+        "tagName": "prerelease"
+      },
+      {
+        "versionNumber": "64.0",
         "tagName": "next"
       }
     ]

From 707e9f71d4301e5649d4cfbd6a1dd99c4c5b1c32 Mon Sep 17 00:00:00 2001
From: Nicolas Kruk <nkruk@salesforce.com>
Date: Thu, 19 Dec 2024 14:27:44 -0500
Subject: [PATCH 2/2] feat: new minor release for spring25(254-patch) branch
 @W-15440507@

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c49a8294..ebfa8e44 100644
--- a/package.json
+++ b/package.json
@@ -218,7 +218,7 @@
   "apiVersionMetadata": {
     "comment": "Refer to ApiVersionMetadata in orgUtils.ts for details",
     "target": {
-      "versionNumber": "64.0",
+      "versionNumber": "63.0",
       "matchingDevServerVersion": "^11.1.0"
     },
     "versionToTagMappings": [