Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add freebsd as target for Library error #1807

Merged
merged 3 commits into from
Sep 13, 2023
Merged

Add freebsd as target for Library error #1807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed81829
Add freebsd as target for Library error
adam-wolfe Sep 13, 2023
fb408a6
chore(secrets): Update CHANGELOG
traeok Sep 13, 2023
869dab9
chore: bump Secrets SDK and dep in CLI, update changelog
traeok Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions packages/cli/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions packages/secrets/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion packages/secrets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/secrets/src/keyring/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/secrets/src/keyring/src/os/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },

Expand Down