diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 11629a7880..4a3f8a19b6 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -11,7 +11,7 @@ on: jobs: audit: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout diff --git a/.github/workflows/auto-comment.yml b/.github/workflows/auto-comment.yml index c54034e5d8..f419e9b80f 100644 --- a/.github/workflows/auto-comment.yml +++ b/.github/workflows/auto-comment.yml @@ -9,7 +9,7 @@ permissions: jobs: processLabelAction: name: Process Label Action - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 39f4b9bae4..2a944964f4 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -9,7 +9,7 @@ on: jobs: changelog: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: ${{ contains( github.event.pull_request.labels.*.name, 'no-changelog') != true }} steps: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6a24499de6..c22721e894 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -15,7 +15,7 @@ on: jobs: analyze: name: Analyze with CodeQL - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 permissions: actions: read contents: read diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 91d87df13d..401992025a 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -12,7 +12,7 @@ on: jobs: lint: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]') steps: diff --git a/.github/workflows/rust-cli-publish.yml b/.github/workflows/rust-cli-publish.yml index 5ac7699de8..366684fc07 100644 --- a/.github/workflows/rust-cli-publish.yml +++ b/.github/workflows/rust-cli-publish.yml @@ -17,7 +17,7 @@ jobs: release: name: Create GitHub Release - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: ZOWEX_VERSION: ${{ steps.get-version.outputs.ZOWEX_VERSION }} @@ -52,7 +52,7 @@ jobs: needs: release - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Install Rust toolchain diff --git a/.github/workflows/rust-cli.yml b/.github/workflows/rust-cli.yml index 2c0c47cb0e..7e038efd3b 100644 --- a/.github/workflows/rust-cli.yml +++ b/.github/workflows/rust-cli.yml @@ -14,7 +14,7 @@ on: jobs: build-linux: name: Build Linux - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]') steps: diff --git a/.github/workflows/secrets-sdk-publish.yml b/.github/workflows/secrets-sdk-publish.yml index 6015eeb40c..efcd45f233 100644 --- a/.github/workflows/secrets-sdk-publish.yml +++ b/.github/workflows/secrets-sdk-publish.yml @@ -6,7 +6,7 @@ name: Secrets SDK Publish jobs: publish: name: Publish - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 defaults: run: working-directory: packages/secrets diff --git a/.github/workflows/secrets-sdk.yml b/.github/workflows/secrets-sdk.yml index 17216f5adb..ecf765d236 100644 --- a/.github/workflows/secrets-sdk.yml +++ b/.github/workflows/secrets-sdk.yml @@ -39,27 +39,27 @@ jobs: npm run build -- --target i686-pc-windows-msvc npm run test target: i686-pc-windows-msvc - - host: ubuntu-latest + - host: ubuntu-22.04 target: x86_64-unknown-linux-gnu use-cross: true build: | set -e CARGO=cross npm run build -- --target x86_64-unknown-linux-gnu - - host: ubuntu-latest + - host: ubuntu-22.04 target: i686-unknown-linux-gnu use-cross: true build: | set -e source scripts/configure-cross.sh i686-unknown-linux-gnu CARGO=cross npm run build -- --target i686-unknown-linux-gnu - - host: ubuntu-latest + - host: ubuntu-22.04 target: armv7-unknown-linux-gnueabihf use-cross: true build: | set -e source scripts/configure-cross.sh armv7-unknown-linux-gnueabihf CARGO=cross npm run build -- --target armv7-unknown-linux-gnueabihf - - host: ubuntu-latest + - host: ubuntu-22.04 target: x86_64-unknown-linux-musl use-cross: true build: | @@ -68,14 +68,14 @@ jobs: - host: macos-latest target: aarch64-apple-darwin build: npm run build -- --target aarch64-apple-darwin - - host: ubuntu-latest + - host: ubuntu-22.04 target: aarch64-unknown-linux-gnu use-cross: true build: | set -e source scripts/configure-cross.sh aarch64-unknown-linux-gnu CARGO=cross npm run build -- --target aarch64-unknown-linux-gnu - - host: ubuntu-latest + - host: ubuntu-22.04 target: aarch64-unknown-linux-musl use-cross: true build: | @@ -207,17 +207,17 @@ jobs: - host: macos-latest target: x86_64-apple-darwin architecture: x64 - - host: ubuntu-latest + - host: ubuntu-22.04 target: x86_64-unknown-linux-gnu - - host: ubuntu-latest + - host: ubuntu-22.04 target: x86_64-unknown-linux-musl - - host: ubuntu-latest + - host: ubuntu-22.04 target: aarch64-unknown-linux-gnu platform: linux/arm64 - - host: ubuntu-latest + - host: ubuntu-22.04 target: aarch64-unknown-linux-musl platform: linux/arm64 - - host: ubuntu-latest + - host: ubuntu-22.04 target: armv7-unknown-linux-gnueabihf platform: linux/arm/v7 node: @@ -249,10 +249,10 @@ jobs: if: ${{ matrix.settings.platform }} - name: Test bindings run: npm run test - if: ${{ matrix.settings.host != 'ubuntu-latest' }} + if: ${{ matrix.settings.host != 'ubuntu-22.04' }} - name: Setup and run tests uses: addnab/docker-run-action@v3 - if: ${{ matrix.settings.host == 'ubuntu-latest' && !endsWith(matrix.settings.target, 'musl') }} + if: ${{ matrix.settings.host == 'ubuntu-22.04' && !endsWith(matrix.settings.target, 'musl') }} with: image: ${{ format('node:{0}-slim', matrix.node) }} options: "-v ${{ github.workspace }}:/build -w /build --cap-add=IPC_LOCK ${{ matrix.settings.platform && format('--platform={0}', matrix.settings.platform) }}" @@ -262,7 +262,7 @@ jobs: cd packages/secrets && dbus-run-session -- bash scripts/linux-test.sh - name: Setup and run tests (MUSL) uses: addnab/docker-run-action@v3 - if: ${{ matrix.settings.host == 'ubuntu-latest' && endsWith(matrix.settings.target, 'musl') }} + if: ${{ matrix.settings.host == 'ubuntu-22.04' && endsWith(matrix.settings.target, 'musl') }} with: image: ${{ format('node:{0}-alpine', matrix.node) }} options: "-v ${{ github.workspace }}:/build -w /build --cap-add=IPC_LOCK ${{ matrix.settings.platform && format('--platform={0}', matrix.settings.platform) }}" diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 0bbf35841c..ee2693c3c3 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -7,7 +7,7 @@ on: jobs: sonar: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: github.event.workflow_run.conclusion == 'success' steps: @@ -21,7 +21,7 @@ jobs: - name: Configure Sonar Scan uses: zowe-actions/octorelease/script@v1 env: - COVERAGE_ARTIFACT: "ubuntu-latest-20.x-results:__tests__/__results__" + COVERAGE_ARTIFACT: "Linux-20.x-results:__tests__/__results__" with: script: sonarConfig diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 6acaccc7f2..7aec8c9e0a 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -9,7 +9,7 @@ permissions: jobs: stale: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/stale@v9 with: diff --git a/.github/workflows/update-project.yml b/.github/workflows/update-project.yml index d429d59f2a..a7269e23dd 100644 --- a/.github/workflows/update-project.yml +++ b/.github/workflows/update-project.yml @@ -18,7 +18,7 @@ permissions: jobs: update-project: name: Move project item - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: zowe-actions/shared-actions/project-move-item@main if: ${{ github.event.issue && fromJSON(env.ISSUE_STATUSES)[github.event.label.name] }} diff --git a/.github/workflows/zowe-cli.yml b/.github/workflows/zowe-cli.yml index d37d5d37a0..44bd3310ac 100644 --- a/.github/workflows/zowe-cli.yml +++ b/.github/workflows/zowe-cli.yml @@ -41,7 +41,7 @@ jobs: node-version: [18.x, 20.x, 22.x] os: - windows-latest - - ubuntu-latest + - ubuntu-22.04 - ${{ github.event.inputs.macos-type || 'macos-14'}} env: @@ -96,7 +96,7 @@ jobs: # Ignore conflict if multiple jobs upload artifact at same time: https://github.com/actions/upload-artifact/issues/506 continue-on-error: true with: - name: zowe-${{ matrix.os }}.tgz + name: zowe-${{ runner.os }}.tgz path: zowe.tgz overwrite: true @@ -114,7 +114,7 @@ jobs: - name: Unlock Keyring id: unlock-keyring - if: ${{ always() && steps.build.outcome == 'success' && matrix.os == 'ubuntu-latest' }} + if: ${{ always() && steps.build.outcome == 'success' && matrix.os == 'ubuntu-22.04' }} uses: t1m0thyj/unlock-keyring@v1 - name: Start Daemon @@ -135,7 +135,7 @@ jobs: if: ${{ always() && steps.build.outcome == 'success' }} uses: actions/upload-artifact@v4 with: - name: ${{ matrix.os }}-${{ matrix.node-version }}-results + name: ${{ runner.os }}-${{ matrix.node-version }}-results path: __tests__/__results__/ - name: Upload Results to Codecov @@ -148,7 +148,7 @@ jobs: release: if: github.event_name == 'push' && github.ref_protected needs: test - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 permissions: issues: write contents: write diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index e733e8ca92..e023876e8a 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -29,7 +29,7 @@ "eslint-plugin-jest": "^26.8.0", "eslint-plugin-unused-imports": "^2.0.0", "fancy-log": "^1.3.3", - "glob": "^7.2.3", + "glob": "^7.0.0", "husky": "^6.0.0", "jest": "^29.0.0", "jest-environment-node": "^29.0.0", @@ -10942,6 +10942,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -19824,6 +19825,53 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/yamljs/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/yamljs/node_modules/glob": { + "version": "9.3.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", + "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", + "dependencies": { + "fs.realpath": "^1.0.0", + "minimatch": "^8.0.2", + "minipass": "^4.2.4", + "path-scurry": "^1.6.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/yamljs/node_modules/minimatch": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", + "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/yamljs/node_modules/minipass": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", + "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", + "engines": { + "node": ">=8" + } + }, "node_modules/yargs": { "version": "15.3.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", @@ -35608,7 +35656,7 @@ "integrity": "sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==", "requires": { "argparse": "^1.0.7", - "glob": "^7.0.5" + "glob": "^9.0.0" }, "dependencies": { "argparse": { @@ -35618,6 +35666,38 @@ "requires": { "sprintf-js": "~1.0.2" } + }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "glob": { + "version": "9.3.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", + "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", + "requires": { + "fs.realpath": "^1.0.0", + "minimatch": "^8.0.2", + "minipass": "^4.2.4", + "path-scurry": "^1.6.1" + } + }, + "minimatch": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", + "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", + "requires": { + "brace-expansion": "^2.0.1" + } + }, + "minipass": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", + "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==" } } }, diff --git a/package.json b/package.json index 1054d75d54..35c6ef7130 100644 --- a/package.json +++ b/package.json @@ -92,5 +92,10 @@ ], "coverageLink": "../unit/coverage/lcov-report/index.html", "resultDir": "__tests__/__results__/jest-stare" + }, + "overrides": { + "yamljs": { + "glob": "^9.0.0" + } } } diff --git a/packages/imperative/CHANGELOG.md b/packages/imperative/CHANGELOG.md index dee8ebf293..15c7875c7a 100644 --- a/packages/imperative/CHANGELOG.md +++ b/packages/imperative/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to the Imperative package will be documented in this file. +## Recent Changes + +- BugFix: Updated transitive dependencies for technical currency [#2425](https://github.com/zowe/zowe-cli/pull/2425) + ## `5.27.6` - BugFix: Resolved an issue where extraneous base profiles were created in project configurations when a nested profile property was updated. [#2404](https://github.com/zowe/zowe-cli/pull/2404) diff --git a/packages/imperative/package.json b/packages/imperative/package.json index ceb65b0bc3..4e75bffe9f 100644 --- a/packages/imperative/package.json +++ b/packages/imperative/package.json @@ -114,5 +114,10 @@ }, "engines": { "node": ">=14.0.0" + }, + "overrides": { + "yamljs": { + "glob": "^9.0.0" + } } } diff --git a/scripts/testCliWorkflow.js b/scripts/testCliWorkflow.js index 3064fab163..430db533bf 100644 --- a/scripts/testCliWorkflow.js +++ b/scripts/testCliWorkflow.js @@ -244,9 +244,9 @@ Usage: - npm run test: act -- --node 16.x --dr - npm run test: act -- --node 16.x --verbose - npm run test: act -- --node 16.x, 14.x -- npm run test: act -- --node 16.x, 14.x --os ubuntu-latest -- npm run test: act -- --node 16.x, 14.x --os ubuntu-latest, windows-latest -- npm run test: act -- --node 16.x --os ubuntu-latest --ap ubuntu-latest=nektos/act-environments-ubuntu:18.04 +- npm run test: act -- --node 16.x, 14.x --os ubuntu-22.04 +- npm run test: act -- --node 16.x, 14.x --os ubuntu-22.04, windows-latest +- npm run test: act -- --node 16.x --os ubuntu-22.04 --ap ubuntu-22.04=nektos/act-environments-ubuntu:18.04 `); }