Merge pull request #2720 from zowe/ci/better-prerelease-versioning

Enable snapshot versions on next branch
zowe · Feb 15, 2024 · 087a324 · 087a324
2 parents 131ede2 + b52410e
commit 087a324
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 21 deletions.
diff --git a/.github/release.config.js b/.github/release.config.js
@@ -17,6 +17,7 @@ module.exports = {
         },
         {
             name: "next",
+            level: "none",
             prerelease: true,
         }
     ],

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -69,10 +69,10 @@ jobs:
           git add packages/*/CHANGELOG.md
 
       - name: Create Snapshot Version
-        if: ${{ github.ref_name != 'next' && steps.octorelease.outcome == 'success' }}
+        if: ${{ steps.octorelease.outcome == 'success' }}
         uses: zowe-actions/octorelease/script@v1
         env:
-          VERSION_STRING: "%s-SNAPSHOT"
+          VERSION_STRING: "${{ github.ref_name != 'next' && '%s-SNAPSHOT' || '%s-next-SNAPSHOT' }}"
         with:
           config-dir: .github
           script: prepareRelease
diff --git a/.prettierignore b/.prettierignore
@@ -6,3 +6,4 @@ lib
 results
 scripts
 node_modules
+pnpm-lock.yaml
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.0.0-next.202402142205",
+  "version": "3.0.0-next-SNAPSHOT",
   "command": {
     "version": {
       "forcePublish": true,

diff --git a/packages/eslint-plugin-zowe-explorer/CHANGELOG.md b/packages/eslint-plugin-zowe-explorer/CHANGELOG.md
@@ -1,17 +1,11 @@
 All notable changes to the "eslint-plugin-zowe-explorer" package will be documented in this file.
 
-## `3.0.0-next.202402142205`
+## TBD Release
 
 ### New features and enhancements
 
 ### Bug fixes
 
-## `3.0.0-next.202401241448`
-
-## `3.0.0-next.202401121747`
-
-## `3.0.0-next.202311171754`
-
 ## `3.0.0-next.202309121526`
 
 ### New features and enhancements

diff --git a/packages/eslint-plugin-zowe-explorer/package.json b/packages/eslint-plugin-zowe-explorer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-zowe-explorer",
-  "version": "3.0.0-next.202402142205",
+  "version": "3.0.0-next-SNAPSHOT",
   "description": "Custom ESLint Rules for ZOWE Explorer",
   "keywords": [
     "eslint",

diff --git a/packages/zowe-explorer-api/package.json b/packages/zowe-explorer-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/zowe-explorer-api",
-  "version": "3.0.0-next.202402142205",
+  "version": "3.0.0-next-SNAPSHOT",
   "description": "Extensibility API for Zowe Explorer.",
   "publisher": "Zowe",
   "author": "Zowe",

diff --git a/packages/zowe-explorer-ftp-extension/package.json b/packages/zowe-explorer-ftp-extension/package.json
@@ -5,7 +5,7 @@
   "author": "Zowe",
   "license": "EPL-2.0",
   "description": "Adds zFTP support to Zowe Explorer demonstrating how to extend the Zowe Explorer using its extensibility API.",
-  "version": "3.0.0-next.202402142205",
+  "version": "3.0.0-next-SNAPSHOT",
   "icon": "resources/zowe-ftp-color.png",
   "repository": {
     "url": "https://github.com/zowe/vscode-extension-for-zowe"
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@zowe/zos-ftp-for-zowe-cli": "2.1.8",
-    "@zowe/zowe-explorer-api": "3.0.0-next.202402142205",
+    "@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT",
     "tmp": "0.2.1"
   },
   "devDependencies": {

diff --git a/packages/zowe-explorer/package.json b/packages/zowe-explorer/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-extension-for-zowe",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "3.0.0-next.202402142205",
+  "version": "3.0.0-next-SNAPSHOT",
   "publisher": "Zowe",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -2087,7 +2087,7 @@
     "copy-webpack-plugin": "^12.0.2",
     "cross-env": "^5.2.0",
     "del": "^4.1.1",
-    "eslint-plugin-zowe-explorer": "3.0.0-next.202402142205",
+    "eslint-plugin-zowe-explorer": "3.0.0-next-SNAPSHOT",
     "event-stream": "^4.0.1",
     "expect": "^24.8.0",
     "geckodriver": "^1.19.1",
@@ -2102,7 +2102,7 @@
   },
   "dependencies": {
     "@zowe/secrets-for-zowe-sdk": "7.18.6",
-    "@zowe/zowe-explorer-api": "3.0.0-next.202402142205",
+    "@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT",
     "dayjs": "^1.11.10",
     "fs-extra": "8.0.1",
     "isbinaryfile": "4.0.4",

diff --git a/packages/zowe-explorer/src/webviews/package.json b/packages/zowe-explorer/src/webviews/package.json
@@ -2,7 +2,7 @@
   "name": "webviews",
   "private": true,
   "type": "module",
-  "version": "3.0.0-next.202402142205",
+  "version": "3.0.0-next-SNAPSHOT",
   "main": "index.js",
   "license": "EPL-2.0",
   "scripts": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ module.exports = { @@
             },
             {
                 name: "next",
+                level: "none",
                 prerelease: true,
             }
         ],
@@ Expand Down @@