From 73aab3a0d7847c9bda0b262ad9b2a2697607e205 Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Fri, 1 Sep 2023 09:39:32 -0400 Subject: [PATCH 1/4] chore: Update CHANGELOG versions Signed-off-by: Trae Yelovich --- packages/cli/CHANGELOG.md | 4 ++-- packages/secrets/CHANGELOG.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index b5058e76ad..3fe1327076 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -2,9 +2,9 @@ All notable changes to the Zowe CLI package will be documented in this file. -## `7.18.3` +## `7.18.4` -- Enhancement: Bump Secrets SDK to `7.18.3` - uses more reliable resolution logic for `prebuilds` folder; adds static CRT for Windows builds. +- Enhancement: Bump Secrets SDK to `7.18.4` - uses more reliable resolution logic for `prebuilds` folder; adds static CRT for Windows builds. ## `7.18.0` diff --git a/packages/secrets/CHANGELOG.md b/packages/secrets/CHANGELOG.md index 21496ab195..5e3f8afa53 100644 --- a/packages/secrets/CHANGELOG.md +++ b/packages/secrets/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Zowe Secrets SDK package will be documented in this file. -## `7.18.3` +## `7.18.4` - Enhancement: Separated module resolution logic during installation; added more error handling to provide a more graceful installation process. - Enhancement: Add static CRT when compiling Windows builds. From c111301eec490f50a56457a473b2ba01fddd87f1 Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Fri, 1 Sep 2023 09:52:11 -0400 Subject: [PATCH 2/4] chore: Change 'enhancement' to 'bugfix' in changelog Signed-off-by: Trae Yelovich --- packages/cli/CHANGELOG.md | 2 +- packages/secrets/CHANGELOG.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 3fe1327076..da7378e9a1 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to the Zowe CLI package will be documented in this file. ## `7.18.4` -- Enhancement: Bump Secrets SDK to `7.18.4` - uses more reliable resolution logic for `prebuilds` folder; adds static CRT for Windows builds. +- BugFix: Bump Secrets SDK to `7.18.4` - uses more reliable resolution logic for `prebuilds` folder; adds static CRT for Windows builds. ## `7.18.0` diff --git a/packages/secrets/CHANGELOG.md b/packages/secrets/CHANGELOG.md index 5e3f8afa53..43029f672a 100644 --- a/packages/secrets/CHANGELOG.md +++ b/packages/secrets/CHANGELOG.md @@ -4,8 +4,8 @@ All notable changes to the Zowe Secrets SDK package will be documented in this f ## `7.18.4` -- Enhancement: Separated module resolution logic during installation; added more error handling to provide a more graceful installation process. -- Enhancement: Add static CRT when compiling Windows builds. +- BugFix: Separated module resolution logic during installation; added more error handling to provide a more graceful installation process. +- BugFix: Add static CRT when compiling Windows builds. - Added OVERVIEW document to package: provides context on the Secrets SDK transition and how it affects Zowe CLI and Zowe Explorer. ## `7.18.2` From 773d71fbeb1d22cdc2a26e1a0865a31fd55bd662 Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Fri, 1 Sep 2023 10:20:05 -0400 Subject: [PATCH 3/4] chore(secrets): add version and license to Cargo.toml Signed-off-by: Trae Yelovich --- packages/secrets/src/keyring/Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/secrets/src/keyring/Cargo.toml b/packages/secrets/src/keyring/Cargo.toml index 89d8267ff6..ba973e38ef 100644 --- a/packages/secrets/src/keyring/Cargo.toml +++ b/packages/secrets/src/keyring/Cargo.toml @@ -1,7 +1,10 @@ [package] edition = "2021" name = "keyring" -version = "0.0.0" +version = "1.0.0" +authors = ["Zowe Project"] +license = "EPL-2.0" +repository = "https://github.com/zowe/zowe-cli" [lib] crate-type = ["cdylib"] From 566c764eef5ab5b491ad447f08afcd1704a164fd Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Fri, 1 Sep 2023 11:13:08 -0400 Subject: [PATCH 4/4] test(ci): default fallback to npm@9 if version is empty Signed-off-by: Trae Yelovich --- .github/workflows/zowe-cli.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zowe-cli.yml b/.github/workflows/zowe-cli.yml index 0f4dd310a8..428bb0a42c 100644 --- a/.github/workflows/zowe-cli.yml +++ b/.github/workflows/zowe-cli.yml @@ -78,7 +78,7 @@ jobs: - name: Use Original NPM Version id: original-npm-version - run: npm install -g npm@${{ steps.npm-version.outputs.number }} + run: npm install -g npm@${{ steps.npm-version.outputs.number || '9' }} - name: Install Rust toolchain id: install-rust