Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(cd): Workflow and Dependency Updates #2529

Merged
merged 5 commits into from
Nov 17, 2023
Merged

fix(cd): Workflow and Dependency Updates #2529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a594eff
Update deployment workflows
zFernand0 Oct 26, 2023
998081e
Attempt to fix theia tests
zFernand0 Oct 26, 2023
e6ceccf
address samples imperative dependency and fix edit-attr script
zFernand0 Oct 26, 2023
4254ec0
update engine and changelog
zFernand0 Oct 30, 2023
f19d6b5
Merge branch 'next' of https://github.com/zowe/vscode-extension-for-z…
zFernand0 Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
with:
fetch-depth: 0

# Make pnpm available for Changelog Checks
- name: Install pnpm
run: npm install -g pnpm

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Use Node.js LTS
uses: actions/setup-node@v3
with:
node-version: '16.x'
node-version: lts/*

- name: Install pnpm and Lerna
run: npm install -g pnpm lerna@6
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/zowe-explorer-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# Continue to run tests on the other systems if one fails
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]
# order operating systems from best to worst
os: [windows-latest, ubuntu-latest, macos-latest]

Expand All @@ -51,14 +51,14 @@ jobs:

- name: Upload test results
uses: actions/upload-artifact@v3
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
with:
name: zowe-explorer-results
path: packages/zowe-explorer/results/

- name: Upload API test results
uses: actions/upload-artifact@v3
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
with:
name: zowe-explorer-api-results
path: packages/zowe-explorer-api/results/
Expand All @@ -69,12 +69,12 @@ jobs:
env_vars: OS,NODE

- name: Package VSIX
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
run: pnpm package
working-directory: packages/zowe-explorer

- name: Archive VSIX artifact
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
uses: actions/upload-artifact@v3
with:
name: zowe-explorer-vsix
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/zowe-explorer-ftp-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# Continue to run tests on the other systems if one fails
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]
# order operating systems from best to worst
os: [windows-latest, ubuntu-latest, macos-latest]

Expand All @@ -51,25 +51,25 @@ jobs:

- name: Upload test results
uses: actions/upload-artifact@v3
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
with:
name: zowe-explorer-ftp-extension-results
path: packages/zowe-explorer-ftp-extension/results/

# Run codecov upload for only one run
# - name: Upload Results to Codecov
# if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
# if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
# uses: codecov/codecov-action@v3
# with:
# env_vars: OS,NODE

- name: Package VSIX
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
run: pnpm package
working-directory: packages/zowe-explorer-ftp-extension

- name: Archive VSIX artifact
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
uses: actions/upload-artifact@v3
with:
name: zowe-explorer-ftp-extension-vsix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zowe-explorer-samples.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
# Continue to run tests on the other systems if one fails
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]

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

Expand Down
19 changes: 11 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
},
"dependencies": {
"@zowe/cli": "7.18.0",
"vscode-nls": "4.1.2"
"vscode-nls": "5.2.0"
},
"devDependencies": {
"@types/jest": "^29.2.3",
"@types/mocha": "^10.0.1",
"@types/node": "^14.18.12",
"@types/vscode": "^1.53.2",
"@types/vscode": "^1.73.0",
"@typescript-eslint/eslint-plugin": "^5.53.0",
"@typescript-eslint/parser": "^5.53.0",
"eslint": "^8.34.0",
Expand All @@ -39,19 +39,22 @@
"mocha": "^10.2.0",
"mocha-junit-reporter": "^2.2.0",
"mocha-multi-reporters": "^1.5.1",
"ovsx": "^0.8.3",
"prettier": "2.6.0",
"rimraf": "^3.0.2",
"ts-jest": "^29.0.3",
"ts-loader": "^8.2.0",
"typescript": "^4.5.3",
"vsce": "2.15.0",
"@vscode/vsce": "2.15.0",
"vscode-nls-dev": "^4.0.0",
"vscode-test": "^1.4.0"
"@vscode/test-electron": "^1.6.0"
},
"overrides": {
"**/json5": "^2.2.2",
"**/optionator": "^0.9.3",
"**/semver": "^7.5.2"
"pnpm": {
"overrides": {
"json5": "^2.2.2",
"optionator": "^0.9.3",
"semver": "^7.5.2"
}
},
"scripts": {
"clean": "pnpm -r run clean",
Expand Down
5 changes: 5 additions & 0 deletions packages/zowe-explorer/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen

### New features and enhancements

- Migrate from Yarn to PNPM.

### Bug fixes

- Update dependencies for technical currency purposes
- Support VS Code engine 1.79.0 and higher.
- Ability to compare 2 files from MVS and/or UNIX System Services views via right click actions, with option to compare in Read-Only mode too.

Expand Down
183 changes: 0 additions & 183 deletions packages/zowe-explorer/__tests__/__integration__/Profiles.integration.test.ts
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions packages/zowe-explorer/__tests__/__integration__/extension.integration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ describe("Extension Integration Tests", async () => {
await vscode.workspace
.getConfiguration()
.update(globals.SETTINGS_DS_HISTORY, { persistence: true, favorites: [] }, vscode.ConfigurationTarget.Global);
const testTree3 = await createDatasetTree(log);
const testTree3 = await createDatasetTree();
expect(testTree3.mFavorites).to.deep.equal([]);
}).timeout(TIMEOUT);

Expand All @@ -842,7 +842,7 @@ describe("Extension Integration Tests", async () => {
await vscode.workspace
.getConfiguration()
.update(globals.SETTINGS_DS_HISTORY, { persistence: true, favorites }, vscode.ConfigurationTarget.Global);
const testTree3 = await createDatasetTree(log);
const testTree3 = await createDatasetTree();
const initializedFavLabels = [`${pattern}.EXT.PDS`, `${pattern}.EXT.PS`, `${pattern}.EXT.SAMPLE.PDS`, `${pattern}.EXT`];
expect(testTree3.mFavorites[0].children.map((node) => node.label)).to.deep.equal(initializedFavLabels);
}).timeout(TIMEOUT);
Expand All @@ -855,7 +855,7 @@ describe("Extension Integration Tests", async () => {
.getConfiguration()
.update(globals.SETTINGS_DS_HISTORY, { persistence: true, favorites }, vscode.ConfigurationTarget.Global);
const logWarnStub = sandbox.spy(log, "warn");
await createDatasetTree(log);
await createDatasetTree();
expect(logWarnStub.gotCalledOnce);
}).timeout(TIMEOUT);

Expand All @@ -875,7 +875,7 @@ describe("Extension Integration Tests", async () => {
await vscode.workspace
.getConfiguration()
.update(globals.SETTINGS_DS_HISTORY, { persistence: true, favorites }, vscode.ConfigurationTarget.Global);
await testTree.initializeFavorites(log);
await testTree.initializeFavorites();
const initializedFavProfileLabels = [`${profileName}`, "badProfileName"];
const goodProfileFavLabels = [`${pattern}.EXT.PDS`, `${pattern}.EXT.PS`, `${pattern}.EXT.SAMPLE.PDS`, `${pattern}.EXT`];
const badProfileFavLabels = [`${pattern}.BAD.PROFILE.EXT.PS`];
Expand Down
2 changes: 1 addition & 1 deletion packages/zowe-explorer/__tests__/__integration__/runTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import * as path from "path";

import { runTests } from "vscode-test";
import { runTests } from "@vscode/test-electron";

async function main() {
try {
Expand Down
Loading
Loading