Skip to content

Commit

Permalink
Merge branch 'next' into ssh-error
Browse files Browse the repository at this point in the history
Signed-off-by: Amber Torrise <[email protected]>
  • Loading branch information
ATorrise authored Mar 13, 2024
2 parents aa42560 + dbbdbba commit c8d8d6e
Show file tree
Hide file tree
Showing 22 changed files with 169 additions and 138 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/rust-cli-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
id: upload-release-asset
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh release upload native-v${{ needs.release.outputs.ZOWEX_VERSION }} target/x86_64-unknown-linux-gnu/release/zowe-linux.tgz
run: gh release upload native-v${{ needs.release.outputs.ZOWEX_VERSION }} target/x86_64-unknown-linux-gnu/release/zowe-linux.tgz --repo ${{ github.repository }}


build-macos:
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
id: upload-release-asset
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh release upload native-v${{ needs.release.outputs.ZOWEX_VERSION }} target/release/zowe-macos.tgz
run: gh release upload native-v${{ needs.release.outputs.ZOWEX_VERSION }} target/release/zowe-macos.tgz --repo ${{ github.repository }}


build-windows:
Expand Down Expand Up @@ -150,4 +150,4 @@ jobs:
id: upload-release-asset
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh release upload native-v${{ needs.release.outputs.ZOWEX_VERSION }} target/release/zowe-windows.tgz
run: gh release upload native-v${{ needs.release.outputs.ZOWEX_VERSION }} target/release/zowe-windows.tgz --repo ${{ github.repository }}
4 changes: 2 additions & 2 deletions __tests__/__packages__/cli-test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zowe/cli-test-utils",
"version": "8.0.0-next.202403061549",
"version": "8.0.0-next.202403122137",
"description": "Test utilities package for Zowe CLI plug-ins",
"author": "Zowe",
"license": "EPL-2.0",
Expand Down Expand Up @@ -43,7 +43,7 @@
"devDependencies": {
"@types/js-yaml": "^4.0.9",
"@types/uuid": "^9.0.8",
"@zowe/imperative": "8.0.0-next.202403061549"
"@zowe/imperative": "8.0.0-next.202403122137"
},
"peerDependencies": {
"@zowe/imperative": "^8.0.0-next"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "8.0.0-next.202403061549",
"version": "8.0.0-next.202403122137",
"command": {
"publish": {
"ignoreChanges": [
Expand Down
122 changes: 61 additions & 61 deletions npm-shrinkwrap.json

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

12 changes: 12 additions & 0 deletions packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ All notable changes to the Zowe CLI package will be documented in this file.

- Enhancement: Prompt for user/password on SSH commands when a token is stored in the config. [#2081](https://github.com/zowe/zowe-cli/pull/2081)

## `8.0.0-next.202403122137`

- BugFix: Fixed default base profile missing in config generated by `zowe config auto-init` [#2088](https://github.com/zowe/zowe-cli/pull/2088)

## `8.0.0-next.202403061549`

- BugFix: Update daemon dependencies for technical currency [#2077](https://github.com/zowe/zowe-cli/pull/2077)
Expand Down Expand Up @@ -87,6 +91,14 @@ LTS Breaking: Removed the following previously deprecated items: [#1981](https:/

- Major: First major version bump for V3

## `7.23.5`

- BugFix: Fixed default base profile missing in config generated by `zowe config auto-init` [#2084](https://github.com/zowe/zowe-cli/pull/2084)

## `7.23.4`

- BugFix: Updated dependencies of the daemon client for technical currency [#2076](https://github.com/zowe/zowe-cli/pull/2076)

## `7.23.3`

- BugFix: Fixed race condition in `config convert-profiles` command that may fail to delete secure values for old profiles
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ function mockConfigApi(properties: IConfig | undefined): any {
},
profiles: {
getProfilePathFromName: (name: string) => `profiles.${name}`,
get: jest.fn()
get: jest.fn().mockReturnValue({})
},
secure: {
securePropsForProfile: jest.fn().mockReturnValue([])
}
},
exists: true,
Expand Down
Loading

0 comments on commit c8d8d6e

Please sign in to comment.