Merge pull request #1807 from zowe/freebsd-cargo-build-fix

Add freebsd as target for Library error
zowe · Sep 13, 2023 · a1a7a87 · a1a7a87
2 parents cc2aaa6 + 869dab9
commit a1a7a87
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the Zowe CLI package will be documented in this file.
 
+## Recent Changes
+
+- BugFix: Bump Secrets SDK to `7.18.5` to resolve build failures for FreeBSD users.
+
 ## `7.18.4`
 
 - BugFix: Bump Secrets SDK to `7.18.4` - uses more reliable resolution logic for `prebuilds` folder; adds static CRT for Windows builds.

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -93,7 +93,7 @@
     "which": "^2.0.2"
   },
   "optionalDependencies": {
-    "@zowe/secrets-for-zowe-sdk": "7.18.4"
+    "@zowe/secrets-for-zowe-sdk": "7.18.5"
   },
   "engines": {
     "node": ">=14.0.0"

diff --git a/packages/secrets/CHANGELOG.md b/packages/secrets/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the Zowe Secrets SDK package will be documented in this file.
 
+## `7.18.5`
+
+- BugFix: Enable `KeyringError::Library` enum variant to fix building on FreeBSD targets.
+
 ## `7.18.4`
 
 - BugFix: Separated module resolution logic during installation; added more error handling to provide a more graceful installation process.

diff --git a/packages/secrets/package.json b/packages/secrets/package.json
@@ -3,7 +3,7 @@
   "description": "Credential management facilities for Imperative, Zowe CLI, and extenders.",
   "repository": "https://github.com/zowe/zowe-cli.git",
   "author": "Zowe",
-  "version": "7.18.4",
+  "version": "7.18.5",
   "homepage": "https://github.com/zowe/zowe-cli/tree/master/packages/secrets#readme",
   "bugs": {
     "url": "https://github.com/zowe/zowe-cli/issues"

diff --git a/packages/secrets/src/keyring/Cargo.lock b/packages/secrets/src/keyring/Cargo.lock
diff --git a/packages/secrets/src/keyring/src/os/error.rs b/packages/secrets/src/keyring/src/os/error.rs
@@ -7,7 +7,7 @@ pub enum KeyringError {
     #[error("[keyring] Invalid parameter provided for '{argument:?}'. Details:\n\n{details:?}")]
     InvalidArg { argument: String, details: String },
 
-    #[cfg(any(target_os = "macos", target_os = "linux"))]
+    #[cfg(any(target_os = "macos", target_os = "linux", target_os = "freebsd"))]
     #[error("[keyring] {name:?} library returned an error:\n\n{details:?}")]
     Library { name: String, details: String },