Skip to content

Commit

Permalink
Merge pull request #2126 from zowe/fix/macos-daemon-tgz
Browse files Browse the repository at this point in the history
Fix macOS tgz containing extra `GNUSparseFile.0` directory
  • Loading branch information
t1m0thyj authored May 3, 2024
2 parents 65d4aa9 + b2ed039 commit 113e5eb
Show file tree
Hide file tree
Showing 5 changed files with 101 additions and 74 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/rust-cli-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
targets: aarch64-apple-darwin
targets: x86_64-apple-darwin

- uses: actions/download-artifact@v4
with:
Expand All @@ -106,10 +106,11 @@ jobs:
mv ../aarch64-apple-darwin/release/zowe zowe.aarch64 && mv ../x86_64-apple-darwin/release/zowe zowe.x86_64
lipo -create -output zowe zowe.aarch64 zowe.x86_64
# Use gtar instead of tar on MacOS to prevent extra `GNUSparseFile.0` directory
- name: Create Archive
run: |
cd target/release
tar -cvzf zowe.tgz zowe
gtar -cvzf zowe.tgz zowe
mv zowe.tgz zowe-macos.tgz
- name: Upload Release Asset
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/rust-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
targets: aarch64-apple-darwin
targets: x86_64-apple-darwin

- name: Build
run: |
Expand All @@ -74,6 +74,7 @@ jobs:
mv ../aarch64-apple-darwin/debug/zowe zowe.aarch64 && mv ../x86_64-apple-darwin/debug/zowe zowe.x86_64
lipo -create -output zowe zowe.aarch64 zowe.x86_64
# Use gtar instead of tar on MacOS to prevent extra `GNUSparseFile.0` directory
- name: Create Archive
run: |
cd zowex/target/debug
Expand Down
4 changes: 4 additions & 0 deletions packages/cli/CHANGELOG.md
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: Fixed `zowe daemon enable` installing an invalid daemon binary on macOS. [#2126](https://github.com/zowe/zowe-cli/pull/2126)

## `7.24.0`

- 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)
Expand Down
159 changes: 90 additions & 69 deletions zowex/Cargo.lock

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

4 changes: 2 additions & 2 deletions zowex/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "zowe"
version = "1.2.1"
version = "1.2.2"
authors = ["Zowe Project"]
edition = "2018"
license = "EPL-2.0"
Expand All @@ -11,7 +11,7 @@ repository = "https://github.com/zowe/zowe-cli"
[dependencies]
base64 = "0.13.1"
home = "0.5.4"
is-terminal = "0.4.9"
is-terminal = "0.4.12"
pathsearch = "0.2.0"
rpassword = "5.0.1"
serde = { version = "1.0.156", features = ["derive"] }
Expand Down

0 comments on commit 113e5eb

Please sign in to comment.