Skip to content

Commit

Permalink
Merge branch 'main' into fix/rm-del-prof-cmd
Browse files Browse the repository at this point in the history
  • Loading branch information
zFernand0 authored Jan 2, 2025
2 parents e383727 + 05721c3 commit 3c5b81f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
push:
branches:
- main
- v1-lts
- v?-lts
pull_request:
branches:
- main
- v1-lts
- v?-lts

jobs:
analyze:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/zowe-explorer-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
matrix:
node-version: [18.x, 20.x, 22.x]
# order operating systems from best to worst
os: [windows-latest, ubuntu-22.04, macos-latest]
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]')

Expand Down Expand Up @@ -56,17 +56,17 @@ jobs:

- name: Unlock Keyring
id: unlock-keyring
if: matrix.os == 'ubuntu-22.04' && matrix.node-version == '20.x'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
uses: t1m0thyj/unlock-keyring@v1

- name: Integration tests
if: matrix.os == 'ubuntu-22.04' && matrix.node-version == '20.x'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
run: xvfb-run pnpm test:integration --exclude "Activation.feature"
working-directory: packages/zowe-explorer

- name: Upload test results
uses: actions/upload-artifact@v4
if: always() && steps.build.outcome == 'success' && matrix.os == 'ubuntu-22.04' && matrix.node-version == '20.x'
if: always() && steps.build.outcome == 'success' && matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
with:
name: zowe-explorer-results
path: |
Expand All @@ -75,7 +75,7 @@ jobs:
- name: Upload API test results
uses: actions/upload-artifact@v4
if: always() && steps.build.outcome == 'success' && matrix.os == 'ubuntu-22.04' && matrix.node-version == '20.x'
if: always() && steps.build.outcome == 'success' && matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
with:
name: zowe-explorer-api-results
path: packages/zowe-explorer-api/results/
Expand All @@ -87,12 +87,12 @@ jobs:
token: ${{ secrets.CODECOV_TOKEN }}

- name: Package VSIX
if: matrix.os == 'ubuntu-22.04' && matrix.node-version == '20.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-22.04' && matrix.node-version == '20.x'
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
uses: actions/upload-artifact@v4
with:
name: zowe-explorer-vsix
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@
*/

import * as vscode from "vscode";
import { ProfilesCache, ZoweExplorerApiType, ZoweTreeNode } from "@zowe/zowe-explorer-api";
import { ProfilesCache, ZoweTreeNode } from "@zowe/zowe-explorer-api";
import { createIProfile, createISession } from "../../__mocks__/mockCreators/shared";
import { ZoweCommandProvider } from "../../../src/commands/ZoweCommandProvider";
import { Profiles } from "../../../src/configuration/Profiles";
import { ZoweDatasetNode } from "../../../src/trees/dataset/ZoweDatasetNode";
import { SharedContext } from "../../../src/trees/shared/SharedContext";
import { createIJobFile } from "../../__mocks__/mockCreators/jobs";
import { AuthUtils } from "../../../src/utils/AuthUtils";

const globalMocks = {
testSession: createISession(),
Expand Down
6 changes: 3 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3c5b81f

Please sign in to comment.