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

Fix macOS tgz containing extra GNUSparseFile.0 directory #2126

Merged
merged 5 commits into from
May 3, 2024
+101 −74
Merged

Fix macOS tgz containing extra GNUSparseFile.0 directory #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86d0bfd
Fix macOS tgz containing extra GNUSparseFile.0 directory
t1m0thyj May 1, 2024
e32363b
Try to fix daemon build on M1 runners
t1m0thyj May 1, 2024
17ba056
Update Cargo.lock for technical currency
t1m0thyj May 2, 2024
9ec5f9c
Update wording of changelog entry
t1m0thyj May 2, 2024
b2ed039
Merge branch 'master' into fix/macos-daemon-tgz
t1m0thyj May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/rust-cli-publish.yml
View file
Open in desktop
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
View file
Open in desktop
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
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: 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
View file
Open in desktop

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
View file
Open in desktop
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
Loading