Update workflows and deps for technical currency (#3373)

Signed-off-by: Timothy Johnson <[email protected]>
zowe · Jan 2, 2025 · 05721c3 · 05721c3
1 parent aea6d92
commit 05721c3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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))
             );
@@ Expand Down @@