Skip to content

Commit

Permalink
Merge branch 'next' into migrate-to-new-tools2
Browse files Browse the repository at this point in the history
Signed-off-by: Rudy Flores <[email protected]>
  • Loading branch information
rudyflores authored Sep 18, 2023
2 parents 749b78c + 38ef0c9 commit bdd45cc
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 27 deletions.
8 changes: 4 additions & 4 deletions .github/release.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ module.exports = {
channel: "zowe-v1-lts",
level: "patch",
},
// {
// name: "next",
// prerelease: true,
// }
{
name: "next",
prerelease: true,
}
],
plugins: [
[
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- main
- maintenance
- next
- v1-lts
paths:
- .github/release.config.js
Expand Down Expand Up @@ -66,7 +67,7 @@ jobs:
git add packages/*/CHANGELOG.md
- name: Create Snapshot Version
if: steps.octorelease.outcome == 'success'
if: ${{ github.ref_name != 'next' && steps.octorelease.outcome == 'success' }}
uses: zowe-actions/octorelease/script@v1
env:
VERSION_STRING: "%s-SNAPSHOT"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.0.0-SNAPSHOT",
"version": "3.0.0-next.202309141150",
"command": {
"version": {
"forcePublish": true,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"private": true,
"engines": {
"vscode": "^1.53.2"
"vscode": "^1.63.0"
},
"workspaces": [
"packages/*"
Expand Down
4 changes: 1 addition & 3 deletions packages/eslint-plugin-zowe-explorer/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
All notable changes to the "eslint-plugin-zowe-explorer" package will be documented in this file.

## TBD Release
## `3.0.0-next.202309121526`

### New features and enhancements

- Added placeholder `madge` script to `package.json` for workspace script to succeed.
- Migrated to new package manager PNPM from Yarn.

### Bug fixes

## `2.9.1`

### New features and enhancements
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-zowe-explorer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-plugin-zowe-explorer",
"version": "3.0.0-SNAPSHOT",
"version": "3.0.0-next.202309141150",
"description": "Custom ESLint Rules for ZOWE Explorer",
"keywords": [
"eslint",
Expand Down
4 changes: 1 addition & 3 deletions packages/zowe-explorer-api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All notable changes to the "zowe-explorer-api" extension will be documented in this file.

## TBD Release
## `3.0.0-next.202309121526`

### New features and enhancements

Expand All @@ -11,8 +11,6 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
- Added `madge` script in `package.json` to track circular dependencies. [#2148](https://github.com/zowe/vscode-extension-for-zowe/issues/2148)
- Migrated to new package manager PNPM from Yarn.

### Bug fixes

## `2.10.0`

### New features and enhancements
Expand Down
2 changes: 1 addition & 1 deletion packages/zowe-explorer-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/zowe-explorer-api",
"version": "3.0.0-SNAPSHOT",
"version": "3.0.0-next.202309141150",
"description": "Extensibility API for Zowe Explorer.",
"publisher": "Zowe",
"author": "Zowe",
Expand Down
4 changes: 1 addition & 3 deletions packages/zowe-explorer-ftp-extension/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
All notable changes to the "zowe-explorer-ftp-extension" extension will be documented in this file.

## TBD Release
## `3.0.0-next.202309121526`

### New features and enhancements

Expand All @@ -9,8 +9,6 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum
- Added `madge` script in `package.json` to track circular dependencies. [#2148](https://github.com/zowe/vscode-extension-for-zowe/issues/2148)
- Migrated to new package manager PNPM from Yarn.

### Bug fixes

## `2.10.0`

### New features and enhancements
Expand Down
6 changes: 3 additions & 3 deletions packages/zowe-explorer-ftp-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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-SNAPSHOT",
"version": "3.0.0-next.202309141150",
"icon": "resources/zowe-ftp-color.png",
"repository": {
"url": "https://github.com/zowe/vscode-extension-for-zowe"
Expand Down Expand Up @@ -45,11 +45,11 @@
"package": "vsce package --no-dependencies && node ../../scripts/mv-pack.js zowe-explorer-ftp-extension vsix"
},
"engines": {
"vscode": "^1.53.2"
"vscode": "^1.63.0"
},
"dependencies": {
"@zowe/zowe-explorer-api": "3.0.0-SNAPSHOT",
"@zowe/zos-ftp-for-zowe-cli": "2.1.2",
"@zowe/zowe-explorer-api": "3.0.0-next.202309141150",
"tmp": "0.2.1"
},
"devDependencies": {
Expand Down
4 changes: 1 addition & 3 deletions packages/zowe-explorer/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All notable changes to the "vscode-extension-for-zowe" extension will be documented in this file.

## TBD Release
## `3.0.0-next.202309121526`

### New features and enhancements

Expand All @@ -13,8 +13,6 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
- Added `madge` script in `package.json` to track circular dependencies. [#2148](https://github.com/zowe/vscode-extension-for-zowe/issues/2148)
- Migrated to new package manager PNPM from Yarn.

### Bug fixes

## `2.10.0`

### New features and enhancements
Expand Down
7 changes: 4 additions & 3 deletions packages/zowe-explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vscode-extension-for-zowe",
"displayName": "%displayName%",
"description": "%description%",
"version": "3.0.0-SNAPSHOT",
"version": "3.0.0-next.202309141150",
"publisher": "Zowe",
"author": "Zowe",
"license": "EPL-2.0",
Expand Down Expand Up @@ -1953,7 +1953,7 @@
"createDemoNodes": "ts-node ./scripts/createDemoNodes.ts"
},
"engines": {
"vscode": "^1.53.2"
"vscode": "^1.63.0"
},
"devDependencies": {
"@napi-rs/cli": "^2.16.1",
Expand All @@ -1970,6 +1970,7 @@
"copy-webpack-plugin": "^6.4.1",
"cross-env": "^5.2.0",
"del": "^4.1.1",
"eslint-plugin-zowe-explorer": "3.0.0-next.202309141150",
"event-stream": "^4.0.1",
"expect": "^24.8.0",
"geckodriver": "^1.19.1",
Expand All @@ -1994,7 +1995,7 @@
},
"dependencies": {
"@zowe/secrets-for-zowe-sdk": "7.18.1",
"@zowe/zowe-explorer-api": "3.0.0-SNAPSHOT",
"@zowe/zowe-explorer-api": "3.0.0-next.202309141150",
"fs-extra": "8.0.1",
"isbinaryfile": "4.0.4",
"js-yaml": "3.13.1",
Expand Down

0 comments on commit bdd45cc

Please sign in to comment.