diff --git a/.github/workflows/create-github-release.yml b/.github/workflows/create-github-release.yml index 633279df..c175a572 100644 --- a/.github/workflows/create-github-release.yml +++ b/.github/workflows/create-github-release.yml @@ -5,10 +5,8 @@ on: branches: - main - prerelease/** - - 252-patch - - 254-patch - - 256-patch - 258-patch + - 260-patch tags-ignore: - '*' workflow_dispatch: diff --git a/.github/workflows/onRelease.yml b/.github/workflows/onRelease.yml index 752ff349..328d46bd 100644 --- a/.github/workflows/onRelease.yml +++ b/.github/workflows/onRelease.yml @@ -48,7 +48,7 @@ jobs: #ctc: true sign: true # 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 == '4' && 'latest') || 'next' }} + tag: ${{ needs.getDistTag.outputs.tag || (needs.getMajorVersion.outputs.major == '4' && 'latest') || (needs.getMajorVersion.outputs.major == '5' && '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 a9845a48..5b99b725 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,7 +1,9 @@ name: tests on: push: - branches-ignore: [main, 252-patch, 254-patch, 256-patch, 258-patch] + branches-ignore: + - main + - '2*-patch' workflow_dispatch: jobs: diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index 3cbeb6b1..ddef30f6 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -3,8 +3,10 @@ name: pr-validation on: pull_request: types: [opened, reopened, edited] - # only applies to PRs that want to merge to main - branches: [main, 252-patch, 254-patch, 256-patch, 258-patch] + # only applies to PRs that want to merge to main or patch branches + branches: + - main + - '2*-patch' jobs: pr-validation: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index eb77658d..608b2534 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,3 +28,33 @@ R2b Release - Create a [patch branch pull request](https://github.com/salesforcecli/plugin-lightning-dev/commit/150bcfa3036018ea49ab73da10d1b470cab0ad43). - Ensure this step completes successfully and has released a newly tagged "latest" version of the plugin to NPM. + +### Branch / Release / API Version Reference + +| Core Branch | Release Name | API Version | Plugin Version | +| ----------- | ------------ | ----------- | -------------- | +| 252-patch | winter25 | 62 | 1 | +| 254-patch | spring25 | 63 | 2 | +| 256-patch | summer25 | 64 | 3 | +| 258-patch | winter26 | 65 | 4 | +| 260-patch | spring26 | 66 | 5 | +| 262-patch | summer26 | 67 | 6 | +| 264-patch | winter27 | 68 | 7 | +| 266-patch | spring27 | 69 | 8 | +| 268-patch | summer27 | 70 | 9 | +| 270-patch | winter28 | 71 | 10 | +| 272-patch | spring28 | 72 | 11 | +| 274-patch | summer28 | 73 | 12 | +| 276-patch | winter29 | 74 | 13 | +| 278-patch | spring29 | 75 | 14 | +| 280-patch | summer29 | 76 | 15 | +| 282-patch | winter30 | 77 | 16 | +| 284-patch | spring30 | 78 | 17 | +| 286-patch | summer30 | 79 | 18 | +| 288-patch | winter31 | 80 | 19 | +| 290-patch | spring31 | 81 | 20 | +| 292-patch | summer31 | 82 | 21 | +| 294-patch | winter32 | 83 | 22 | +| 296-patch | spring32 | 84 | 23 | +| 298-patch | summer32 | 85 | 24 | +| 300-patch | winter33 | 86 | 25 | diff --git a/package.json b/package.json index 730d1574..132a55c2 100644 --- a/package.json +++ b/package.json @@ -250,14 +250,18 @@ }, { "versionNumber": "64.0", - "tagName": "latest" + "tagName": "v3" }, { "versionNumber": "65.0", - "tagName": "prerelease" + "tagName": "latest" }, { "versionNumber": "66.0", + "tagName": "prerelease" + }, + { + "versionNumber": "67.0", "tagName": "next" } ]