1.19 to next (2nd go)

.github/PULL_REQUEST_TEMPLATE.md

@@ -38,6 +38,10 @@ _Put an `x` in the boxes that apply. You can also fill these out after creating
 - [ ] I have added necessary documentation (if appropriate)
 - [ ] Any PR dependencies have been merged and published (if appropriate)
 
+## Reminder
+
+After a PR is merged into the `master` branch, create a PR from `master` to the `next` branch resolving any conflicts.
+
 ## Further comments
 
 If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...

.github/actions/common.js

@@ -25,9 +25,12 @@ const publishProject = (checkVersion, publishSpecificProject) => {
         const packagePath = path.normalize(core.getInput("package"));
         const topPackageJson = JSON.parse(readFileSync("package.json"));
         const packageJson = JSON.parse(readFileSync(path.join(packagePath, "package.json")));
+        let versionName = `${packageJson.name}-${topPackageJson.version}`;
+        versionName = versionName.replace("@", "").replace("/", "-");
+        core.setOutput("archive", versionName);
 
         // Check if there is a new version to publish (looking at the top level package.json for version)
-        if (checkVersion(packageJson, topPackageJson.version)) {
+        if (checkVersion(packageJson, topPackageJson.version) || topPackageJson.version.includes(`SNAPSHOT`)) {
             console.log(`No new version to publish at this time. Current version: ${topPackageJson.version}`);
             if (topPackageJson.version != packageJson.version) {
                 console.log(
@@ -49,11 +52,8 @@ const publishProject = (checkVersion, publishSpecificProject) => {
                 console.log(execSync(`git add package.json`, { cwd: packagePath }).toString());
             }
 
-            let versionName = `${packageJson.name}-${topPackageJson.version}`;
-            versionName = versionName.replace("@", "").replace("/", "-");
             console.log(`Generate: ${versionName}`);
             console.log(execSync(`yarn package`, { cwd: packagePath }).toString());
-            core.setOutput("archive", versionName);
             // set tag for deployment
             let tag = "";
             if (versionName.includes("next")) {
@@ -63,23 +63,23 @@ const publishProject = (checkVersion, publishSpecificProject) => {
             }
 
             publishSpecificProject(versionName, core.getInput("token"), packagePath, tag);
+        }
 
-            let changelog = execSync(
-                "awk -v ver=" +
-                    topPackageJson.version +
-                    " '/## / {if (p) { exit }; if ($2 ~ ver) { p=1; next} } p && NF' CHANGELOG.md | sed -z \"s/'/'\\\\\\''/g\" | sed -z 's/\"/\\\"/g' | sed -z 's/\\n/\\\\n/g'",
-                { cwd: packagePath }
-            ).toString();
-            if (changelog != "") {
-                changelog = `#### ${core.getInput("name")}\n${changelog}`;
-                console.log("changelog", changelog);
-                core.setOutput("changelog", changelog);
-            } else {
-                // No changelog for this version
-                console.log("No changelog available for version:", topPackageJson.version);
+        let changelog = execSync(
+            "awk -v ver=" +
+                topPackageJson.version +
+                " '/## / {if (p) { exit }; if ($2 ~ ver) { p=1; next} } p && NF' CHANGELOG.md | sed -z \"s/'/'\\\\\\''/g\" | sed -z 's/\"/\\\"/g' | sed -z 's/\\n/\\\\n/g'",
+            { cwd: packagePath }
+        ).toString();
+        if (changelog != "") {
+            changelog = `#### ${core.getInput("name")}\n${changelog}`;
+            console.log("changelog", changelog);
+            core.setOutput("changelog", changelog);
+        } else {
+            // No changelog for this version
+            console.log("No changelog available for version:", topPackageJson.version);
 
-                // TODO: Decide whether to use `Recent Changes` method (similar to CLIs)
-            }
+            // TODO: Decide whether to use `Recent Changes` method (similar to CLIs)
         }
     } catch (err) {
         // Fail the workflow if any commands threw an error

.github/workflows/deployment.yml

@@ -11,7 +11,7 @@ on:
     inputs:
       version:
         description: Version to be published
-        default: v1.18.0
+        default: v1.19.0
         required: false
       # create_release:
       #   description: Create the release even if publishing already happened
@@ -67,6 +67,8 @@ jobs:
     steps:
       - name: Checkout the Source Code
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
       - name: Setup NodeJS
         uses: actions/setup-node@v1
@@ -146,27 +148,27 @@ jobs:
       - name: Get Top-Level package.json
         run: "echo ::set-output name=top_package::$(cat package.json)"
         id: get_version
-
-      - name: Check if files were staged
-        run: "echo ::set-output name=files_staged::$(git diff --cached --quiet || echo $?)"
+      - name: Get most recent GitHub release version
+        id: get_gh_version
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+
+      # Removed step because of issues with publishing
+      # - name: Check if files were staged
+      #   run: "echo ::set-output name=files_staged::$(git diff --cached --quiet || echo $?)"
+      #   id: check_project
+
+      - name: Check version is bumped
+        if: ${{ !contains(steps.get_gh_version.outputs.tag, fromJson(steps.get_version.outputs.top_package).version) }}
+        run: echo "::set-output name=version_bumped::true"
         id: check_project
 
-      # Each individual action should git-add the desired files
-      - name: Update Project Files with new Version
-        if: steps.check_project.outputs.files_staged == 1
-        run: |
-          git status
-          git commit -m "Version Bumped to ${{ fromJson(steps.get_version.outputs.top_package).version }}" --signoff
-      - name: Push changes
-        if: steps.check_project.outputs.files_staged == 1
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          force: true
-          branch: ${{ github.ref }}
+      - name: Check version is a pre-release
+        if: ${{ endsWith(fromJson(steps.get_version.outputs.top_package).version, 'SNAPSHOT') }}
+        run: echo "::set-output name=pre_release::true"
+        id: is_pre_release
 
       - name: Create the Release
-        if: steps.check_project.outputs.files_staged == 1
+        if: steps.check_project.outputs.version_bumped && !steps.is_pre_release.outputs.pre_release
         id: create_release
         uses: actions/create-release@v1
         env:
@@ -183,10 +185,7 @@ jobs:
           prerelease: false
 
       - name: Upload the Zowe Explorer Assets
-        if: |
-          steps.check_project.outputs.files_staged == 1 &&
-          steps.deploy_zowe_explorer.outputs.archive != null
-        # steps.check_project.outputs.files_staged == 1 || github.event.input.create_release == 'true') &&
+        if: steps.check_project.outputs.version_bumped && !steps.is_pre_release.outputs.pre_release
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -197,10 +196,7 @@ jobs:
           asset_content_type: application/octet-stream
 
       - name: Upload the FTP Extension for Zowe Explorer Assets
-        if: |
-          steps.check_project.outputs.files_staged == 1 &&
-          steps.deploy_zowe_explorer_ftp_extension.outputs.archive != null
-        # steps.check_project.outputs.files_staged == 1 || github.event.input.create_release == 'true') &&
+        if: steps.check_project.outputs.version_bumped && !steps.is_pre_release.outputs.pre_release
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -211,10 +207,7 @@ jobs:
           asset_content_type: application/octet-stream
 
       - name: Upload the Zowe Explorer APIs Assets
-        if: |
-          steps.check_project.outputs.files_staged == 1 &&
-          steps.deploy_zowe_explorer_api.outputs.archive != null
-        # steps.check_project.outputs.files_staged == 1 || github.event.input.create_release == 'true') &&
+        if: steps.check_project.outputs.version_bumped && !steps.is_pre_release.outputs.pre_release
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -223,17 +216,13 @@ jobs:
           asset_path: ./dist/${{ steps.deploy_zowe_explorer_api.outputs.archive }}.tgz
           asset_name: ${{ steps.deploy_zowe_explorer_api.outputs.archive }}.tgz
           asset_content_type: application/octet-stream
-
-      - name: Upload the ESLint plugin for Zowe Explorer Assets
-        if: |
-          steps.check_project.outputs.files_staged == 1 &&
-          steps.deploy_eslint_plugin_zowe_explorer.outputs.archive != null
-        # steps.check_project.outputs.files_staged == 1 || github.event.input.create_release == 'true') &&
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/${{ steps.deploy_eslint_plugin_zowe_explorer.outputs.archive }}.tgz
-          asset_name: ${{ steps.deploy_eslint_plugin_zowe_explorer.outputs.archive }}.tgz
-          asset_content_type: application/octet-stream
+      # - name: Upload the ESLint plugin for Zowe Explorer Assets
+      #   if: steps.check_project.outputs.version_bumped
+      #   uses: actions/upload-release-asset@v1
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #   with:
+      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
+      #     asset_path: ./dist/${{ steps.deploy_eslint_plugin_zowe_explorer.outputs.archive }}.tgz
+      #     asset_name: ${{ steps.deploy_eslint_plugin_zowe_explorer.outputs.archive }}.tgz
+      #     asset_content_type: application/octet-stream

.github/workflows/theia-zowe-explorer-ci.yml

@@ -37,7 +37,7 @@ jobs:
       - run: ls -la temp/plugins
 
       - name: Start Theia
-        run: docker run --name theia --init -d -p 3000:3000 -v "${PWD}/temp:/home/theia/.theia" theiaide/theia
+        run: docker run --name theia --init -d -p 3000:3000 -v "${PWD}/temp:/home/theia/.theia" theiaide/theia:1.15.0
       # NOTE(Kelosky): alternatively, we could run docker via something like this; however, we cannot hot reload
       #                hosted VS Code extensions after theia is started (at least at the time this was written).
       # services:

.github/workflows/zowe-explorer-ftp-ci.yml

@@ -16,7 +16,7 @@ jobs:
       # Continue to run tests on the other systems if one fails
       fail-fast: false
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [12.x, 14.x]
         # order operating systems from best to worst
         os: [windows-latest, ubuntu-latest, macos-latest]
 

.vscode/launch.json

@@ -50,9 +50,8 @@
         "--extensionTestsPath=${workspaceFolder}/packages/zowe-explorer/out/__tests__/__integration__/index"
       ],
       "outFiles": ["${workspaceFolder}/out/__tests__/**/*.js"],
-      "preLaunchTask": "Pretest",
-      "smartStep": true,
-      "skipFiles": ["<node_internals>/**"]
+      "preLaunchTask": "Build",
+      "postDebugTask": "Posttest"
     }
   ]
 }

.vscode/tasks.json

@@ -104,11 +104,32 @@
       "group": "build",
       "isBackground": false,
       "type": "shell",
+      "options": {
+        "cwd": "scripts"
+      },
+      "command": "ts-node create-env.ts"
+    },
+    {
+      "label": "Build",
+      "group": "build",
+      "isBackground": false,
+      "type": "shell",
       "options": {
         "cwd": "packages/zowe-explorer"
       },
       "command": "yarn",
-      "args": ["build:integration"]
+      "args": ["build:integration"],
+      "dependsOn": "Pretest"
+    },
+    {
+      "label": "Posttest",
+      "group": "build",
+      "isBackground": false,
+      "type": "shell",
+      "options": {
+        "cwd": "scripts"
+      },
+      "command": "ts-node clean-env.ts"
     }
   ]
 }

README.md

@@ -80,7 +80,7 @@ Use the following list with the description and links to find the topics of your
 
 **Note**: Zowe Explorer FTP extension is an example that shows how the extensibility API is used to add new capabilities to Zowe Explorer.
 
-[Zowe Explorer Developer's ReadMe](https://github.com/zowe/vscode-extension-for-zowe/blob/master/docs/Developer's%20ReadMe.md) — contains information on how to install, build, and test Zowe Explorer.
+[Zowe Explorer Developer's ReadMe](https://github.com/zowe/vscode-extension-for-zowe/blob/master/docs/README-Developer.md) — contains information on how to install, build, and test Zowe Explorer.
 
 [Zowe Explorer in Theia ReadMe](https://github.com/zowe/vscode-extension-for-zowe/blob/master/docs/README-Theia.md) — contains information on how to develop for the Web-based IDE Eclipse Theia.
 

docs/README-Developer.md

@@ -76,26 +76,15 @@ To test the extension, the mainframe data sets under `normalPattern` must match
   - "TCHILD2"
 - `normalPattern` + ".PUBLIC.TPS"
 
-The `./scripts` folder contains the following scripts to help you set up the required file structure. You can execute the scripts when the `ts-node` package is installed globally.
-
-- [create-env](/scripts/create-env.ts): Creates the proper data sets on the mainframe.
-- [clean-env](/scripts/clean-env.ts): Cleans up the data sets created on the mainframe.
-
-**Note:** The scripts use the profile that you specified in `testProfileData`.
-
-##### Execute the setup scripts
-
-1. Issue the following command to install `ts-node` globally:
-
-   `npm install -g ts-node`
+#### Or pattern
 
-2. Issue the following command to execute script as if it were a node script.
+There is no required structure for the mainframe data sets under `orPattern`.
 
-   `ts-node ./scripts/clean-env.ts` or `ts-node ./scripts/create-env.ts`
+#### Prerequisites
 
-#### Or pattern
+To run the system tests, ensure that you have `ts-node` insalled globally by running the following command:
 
-There is no required structure for the mainframe data sets under `orPattern`.
+`npm install -g ts-node`
 
 ### Executing from VSC