Skip to content

Commit

Permalink
Merge pull request #1379 from zowe/ftp-build
Browse files Browse the repository at this point in the history
Remove redundant entry from ZE FTP vscodeignore
  • Loading branch information
zFernand0 authored Jun 29, 2021
2 parents 0aa081b + 58af539 commit 838ba19
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 14 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: Deployment of Zowe Explorer and related extensions
on:
push:
branches:
- master
- v1.16.x
paths:
- package.json
workflow_dispatch:
inputs:
version:
description: Version to be published
default: v1.16.0
default: v1.16.1
required: false
# create_release:
# description: Create the release even if publishing already happened
Expand Down Expand Up @@ -133,6 +133,15 @@ jobs:
# with:
# package: packages/eslint-plugin-zowe-explorer

- name: Create Packages for Archiving Purposes
run: yarn package

- name: Archive Built Artifacts
uses: actions/upload-artifact@v2
with:
name: zowe-explorer-artifacts
path: dist/*

- name: Get Top-Level package.json
run: "echo ::set-output name=top_package::$(cat package.json)"
id: get_version
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zowe-explorer",
"version": "1.16.0",
"version": "1.16.1",
"description": "Monorepo for the Zowe Explorer project.",
"publisher": "Zowe",
"author": "Zowe",
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": "1.16.0",
"version": "1.16.1",
"description": "Custom ESLint Rules for ZOWE Explorer",
"keywords": [
"eslint",
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": "1.16.0",
"version": "1.16.1",
"description": "Extensibility API for Zowe Explorer.",
"publisher": "Zowe",
"author": "Zowe",
Expand Down
1 change: 0 additions & 1 deletion packages/zowe-explorer-ftp-extension/.vscodeignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.vscode/**
src
.*ignore
.*rc*
*.config.js
Expand Down
4 changes: 4 additions & 0 deletions packages/zowe-explorer-ftp-extension/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## `1.16.1`

- Removed redundant entry from the `.vscodeignore` file in order to help generate the `extension.js` file for the VS Code Marketplace release

## `1.16.0`

- Added the function that closes the connection at the end of each FTP operation
Expand Down
6 changes: 3 additions & 3 deletions packages/zowe-explorer-ftp-extension/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ Zowe Explorer's FTP extension adds the FTP protocol to the [Zowe Explorer](https

This VS Code extension also serves as a [source code example](https://github.com/zowe/vscode-extension-for-zowe/tree/master/packages/zowe-explorer-ftp-extension) demonstrating how to use the [Zowe Explorer Extensibility API](https://github.com/zowe/vscode-extension-for-zowe/tree/master/packages/zowe-explorer-api) to create VS Code extensions that extend the Zowe Explorer VS Code extensions with new capabilities.

## What's new in 1.16.0
## What's new in 1.16.1

Added:
Bugfix:

- Added the function that closes the connection at the end of each FTP operation.
- Generate the `extension.js` file for the VS Code Marketplace release.

For more information, see [Changelog](https://github.com/zowe/vscode-extension-for-zowe/blob/master/packages/zowe-explorer-ftp-extension/CHANGELOG.md).

Expand Down
4 changes: 2 additions & 2 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": "1.16.0",
"version": "1.16.1",
"icon": "resources/zowe_ftp_logo.png",
"repository": {
"url": "https://github.com/zowe/vscode-extension-for-zowe"
Expand Down Expand Up @@ -45,7 +45,7 @@
"vscode": "^1.43.0"
},
"dependencies": {
"@zowe/zowe-explorer-api": "1.16.0",
"@zowe/zowe-explorer-api": "1.16.1",
"@zowe/zos-ftp-for-zowe-cli": "1.5.0",
"tmp": "0.2.1"
},
Expand Down
6 changes: 3 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": "1.16.0",
"version": "1.16.1",
"publisher": "Zowe",
"author": "Zowe",
"license": "EPL-2.0",
Expand Down Expand Up @@ -1655,7 +1655,7 @@
"@types/promise-queue": "^2.2.0",
"@types/selenium-webdriver": "^3.0.4",
"@types/yargs": "^11.0.0",
"eslint-plugin-zowe-explorer": "1.16.0",
"eslint-plugin-zowe-explorer": "1.16.1",
"@typescript-eslint/eslint-plugin": "^2.31.0",
"@typescript-eslint/parser": "^2.31.0",
"eslint": "^6.8.0",
Expand Down Expand Up @@ -1695,7 +1695,7 @@
"webpack-cli": "^3.3.11"
},
"dependencies": {
"@zowe/zowe-explorer-api": "1.16.0",
"@zowe/zowe-explorer-api": "1.16.1",
"fs-extra": "8.0.1",
"isbinaryfile": "4.0.4",
"js-yaml": "3.13.1",
Expand Down

0 comments on commit 838ba19

Please sign in to comment.