diff --git a/.github/workflows/create-github-release.yml b/.github/workflows/create-github-release.yml index 0b744c0..1a3780e 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 b1a105e..da05553 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 f09db51..b2d448d 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 adfafbd..4fcb617 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 53285e0..054dd3e 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" } ]