Fix macOS tgz containing extra GNUSparseFile.0 directory

Signed-off-by: Timothy Johnson <[email protected]>
zowe · May 1, 2024 · 86d0bfd · 86d0bfd
1 parent 0a961e2
commit 86d0bfd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/rust-cli-publish.yml b/.github/workflows/rust-cli-publish.yml
@@ -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

diff --git a/.github/workflows/rust-cli.yml b/.github/workflows/rust-cli.yml
@@ -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

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: Fixed packaging of daemon binary for 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)

diff --git a/zowex/Cargo.lock b/zowex/Cargo.lock
diff --git a/zowex/Cargo.toml b/zowex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zowe"
-version = "1.2.1"
+version = "1.2.2"
 authors = ["Zowe Project"]
 edition = "2018"
 license = "EPL-2.0"