From 05721c3fa5ed84bb4307d698cc8fcf9402b7de2c Mon Sep 17 00:00:00 2001 From: Timothy Johnson Date: Thu, 2 Jan 2025 09:49:55 -0500 Subject: [PATCH] Update workflows and deps for technical currency (#3373) Signed-off-by: Timothy Johnson --- .github/workflows/codeql.yml | 4 ++-- .github/workflows/zowe-explorer-ci.yml | 14 +++++++------- .../commands/ZoweCommandProvider.unit.test.ts | 3 +-- .../zowe-explorer/src/trees/dataset/DatasetInit.ts | 2 +- packages/zowe-explorer/src/utils/AuthUtils.ts | 4 ++-- pnpm-lock.yaml | 6 +++--- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 40a0674042..1605845167 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -4,11 +4,11 @@ on: push: branches: - main - - v1-lts + - v?-lts pull_request: branches: - main - - v1-lts + - v?-lts jobs: analyze: diff --git a/.github/workflows/zowe-explorer-ci.yml b/.github/workflows/zowe-explorer-ci.yml index 851cf62c2c..ad4251089f 100644 --- a/.github/workflows/zowe-explorer-ci.yml +++ b/.github/workflows/zowe-explorer-ci.yml @@ -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]') @@ -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: | @@ -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/ @@ -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 diff --git a/packages/zowe-explorer/__tests__/__unit__/commands/ZoweCommandProvider.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/commands/ZoweCommandProvider.unit.test.ts index 54916f2a3e..ed4f20d82d 100644 --- a/packages/zowe-explorer/__tests__/__unit__/commands/ZoweCommandProvider.unit.test.ts +++ b/packages/zowe-explorer/__tests__/__unit__/commands/ZoweCommandProvider.unit.test.ts @@ -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(), diff --git a/packages/zowe-explorer/src/trees/dataset/DatasetInit.ts b/packages/zowe-explorer/src/trees/dataset/DatasetInit.ts index 94ea260283..7eb68b07db 100644 --- a/packages/zowe-explorer/src/trees/dataset/DatasetInit.ts +++ b/packages/zowe-explorer/src/trees/dataset/DatasetInit.ts @@ -192,7 +192,7 @@ export class DatasetInit { await datasetProvider.onDidChangeConfiguration(e); }) ); - + context.subscriptions.push( vscode.commands.registerCommand("zowe.ds.pdsSearchFor", async (node: IZoweDatasetTreeNode) => DatasetActions.search(context, node)) ); diff --git a/packages/zowe-explorer/src/utils/AuthUtils.ts b/packages/zowe-explorer/src/utils/AuthUtils.ts index 523f574697..990a06b0dc 100644 --- a/packages/zowe-explorer/src/utils/AuthUtils.ts +++ b/packages/zowe-explorer/src/utils/AuthUtils.ts @@ -64,8 +64,8 @@ export class AuthUtils { ) { const correlation = ErrorCorrelator.getInstance().correlateError(ZoweExplorerApiType.All, err, { templateArgs: { - profileName: profile.name - } + profileName: profile.name, + }, }); void AuthUtils.promptForAuthentication(err, profile, correlation).catch( (error) => error instanceof Error && ZoweLogger.error(error.message) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef6aaeb290..6d34252a9d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9421,8 +9421,8 @@ packages: dev: false optional: true - /nanoid@3.3.7: - resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} + /nanoid@3.3.8: + resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true dev: true @@ -10161,7 +10161,7 @@ packages: resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} engines: {node: ^10 || ^12 || >=14} dependencies: - nanoid: 3.3.7 + nanoid: 3.3.8 picocolors: 1.1.0 source-map-js: 1.2.0 dev: true