Skip to content
This repository has been archived by the owner on Feb 7, 2024. It is now read-only.

fix(vault): Address Vault related issues #331

Merged
merged 11 commits into from
Aug 28, 2023
34 changes: 34 additions & 0 deletions .github/release.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
module.exports = {
branches: [
{
name: "main",
level: "minor",
},
{
name: "v1-lts",
level: "patch",
},
{
name: "next",
prerelease: true,
}
],
plugins: [
[
"@octorelease/vsce",
{
ovsxPublish: true,
vscePublish: true,
vsixDir: "dist",
},
],
[
"@octorelease/github",
{
assets: ["dist/*.vsix"],
draftRelease: true,
},
],
"@octorelease/git",
],
};
23 changes: 0 additions & 23 deletions .github/workflows/deploy-to-marketplace.yml

This file was deleted.

105 changes: 86 additions & 19 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,101 @@
name: VSIX
name: Zowe CICS Explorer
on:
push:
branches: [main]

pull_request:
workflow_dispatch:
inputs:
version:
description: Version to be published
required: true

jobs:
build_vsix:
name: build_vsix
runs-on: ubuntu-latest
build:
runs-on: ${{ matrix.os }}

timeout-minutes: 60

concurrency:
group: ${{ matrix.os }}-node-${{ matrix.node-version }}-ci-${{ github.ref }}
cancel-in-progress: true

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

if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]')

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- name: Check out code
uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: 14
registry-url: https://registry.npmjs.org/
node-version: ${{ matrix.node-version }}

- name: Install Dependencies
run: npm i

- name: Build
run: npm run build
zFernand0 marked this conversation as resolved.
Show resolved Hide resolved

- name: Lint
run: npm run lint

# - name: Tests
# run: npm run test

deploy:
if: github.event_name == 'workflow_dispatch'
needs: build
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
persist-credentials: false
ref: ${{ github.ref }}

- name: Use Node.js LTS
uses: actions/setup-node@v3
with:
node-version: lts/*

- run: npm i

- name: Install VSCE
run: npm i -g vsce

- name: Package VSIX
run: vsce package

- name: Update Repo
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git add cics-extension-for-zowe*
git commit -s -m "Auto Update VSIX"
git push
run: npm run package

# - name: Publish to Marketplace
# run: vsce publish -p ${{ secrets.VSCODE_TOKEN }}

- uses: zowe-actions/octorelease@master
id: octorelease
if: ${{ !contains(github.event.inputs.version, '-SNAPSHOT') }}
env:
GIT_COMMITTER_NAME: ${{ secrets.ZOWE_ROBOT_USER }}
GIT_COMMITTER_EMAIL: ${{ secrets.ZOWE_ROBOT_EMAIL }}
GIT_CREDENTIALS: x-access-token:${{ secrets.ZOWE_ROBOT_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OVSX_PAT: ${{ secrets.OPENVSX_PUBLISH_TOKEN }}
VSCE_PAT: ${{ secrets.VSCODE_TOKEN }}
with:
config-dir: .github
new-version: ${{ github.event.inputs.version }}

- name: Create Snapshot Version
if: steps.octorelease.outcome == 'success'
uses: zowe-actions/octorelease/script@master
env:
VERSION_STRING: "%s-SNAPSHOT"
with:
config-dir: .github
script: prepareRelease
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
node_modules/
out/
.history/
logs/
logs/
.vscode/*.env
dist/*
!dist/*.md
.vscode-test/
results/**
3 changes: 2 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"request": "launch",
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
"outFiles": ["${workspaceFolder}/out/**/*.js"],
"preLaunchTask": "${defaultBuildTask}"
"preLaunchTask": "${defaultBuildTask}",
"envFile": "${workspaceFolder}/.vscode/.env"
},
{
"name": "Run Extension Tests",
Expand Down
6 changes: 6 additions & 0 deletions .vscode/sample_env
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Create a ".env" file with the contents of this file

# Make sure to get a valid DBus Session Address
# by unlocking the keyring on a terminal, and
# copy the contents of "echo $DBUS_SESSION_BUS_ADDRESS"
DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/0/bus
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

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

## `2.3.1`

- BugFix: Updated Zowe Explorer API depepdency to leverage the Secrets for Zowe SDK. [#324](https://github.com/zowe/vscode-extension-for-cics/issues/324)

## `2.3.0`
- Provided the ability to view relevant programs beneath the library dataset resource [#295](https://github.com/zowe/vscode-extension-for-cics/pull/295).
- Provided search filter functionality for programs associated with datasets and for datasets associated with libraries [#295](https://github.com/zowe/vscode-extension-for-cics/pull/295).
Expand All @@ -14,7 +18,7 @@ All notable changes to the "cics-extension-for-zowe" extension will be documente
- Integrated search functionality for Pipelines and Web Services for both stand-alone regions and plex systems) [#316](https://github.com/zowe/vscode-extension-for-cics/pull/316).
- Incorporated `Show Attributes` Command for all resources under the web folder [#305](https://github.com/zowe/vscode-extension-for-cics/pull/305) & [#316](https://github.com/zowe/vscode-extension-for-cics/pull/316).
- Integrated the ability to show key attributes on the TCPIPS and URIMAPS resource tree node [#316](https://github.com/zowe/vscode-extension-for-cics/pull/316).
- Fixed alignment inconsistency for attributes table for all resources [#318](https://github.com/zowe/vscode-extension-for-cics/pull/318).
- Fixed alignment inconsistency for attributes table for all resources [#318](https://github.com/zowe/vscode-extension-for-cics/pull/318).

## `2.2.0`
- Added the ability to carry user input in the subsequent search filter for all resources [#258](https://github.com/zowe/vscode-extension-for-cics/pull/258).
Expand Down Expand Up @@ -56,7 +60,7 @@ All notable changes to the "cics-extension-for-zowe" extension will be documente
- Added new icons for CICS System Groups and improved existing CICS Plex icon[#154](https://github.com/zowe/vscode-extension-for-cics/pull/154)
- Fixed all command palette actions to work with their associated resource [#151](https://github.com/zowe/vscode-extension-for-cics/pull/151).
- Added progress bar to indicate the loading of resources when filtering [#152](https://github.com/zowe/vscode-extension-for-cics/pull/152).
- Updated the filtering prompts to be consistent with Zowe Explorer [#149](https://github.com/zowe/vscode-extension-for-cics/pull/149).
- Updated the filtering prompts to be consistent with Zowe Explorer [#149](https://github.com/zowe/vscode-extension-for-cics/pull/149).
## `1.2.0`
- Updated tree nodes to lazily load contents so that resources are only fetched when necessary [#124](https://github.com/zowe/vscode-extension-for-cics/issues/124).
- Added 'All Programs', 'All Local Transactions' and 'All Local Files' trees to show all resources under a plex [#138](https://github.com/zowe/vscode-extension-for-cics/pull/138).
Expand Down
3 changes: 3 additions & 0 deletions dist/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Publication Directory

When you run `npm package` the resulting applications will be copied here.
Loading