diff --git a/.github/workflows/rust-cli-publish.yml b/.github/workflows/rust-cli-publish.yml index b4905d661e..af68a05470 100644 --- a/.github/workflows/rust-cli-publish.yml +++ b/.github/workflows/rust-cli-publish.yml @@ -61,7 +61,7 @@ jobs: - uses: actions/download-artifact@v3 with: name: repo - + - name: Prepare Cross run: cargo install cross@0.2.5 @@ -102,13 +102,20 @@ jobs: - name: Install Rust toolchain uses: dtolnay/rust-toolchain@stable + with: + targets: aarch64-apple-darwin - uses: actions/download-artifact@v3 with: name: repo - name: Build - run: cargo build --verbose --release + run: | + cargo build --verbose --release --target aarch64-apple-darwin + cargo build --verbose --release --target x86_64-apple-darwin + mkdir -p target/release && cd target/release + 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 - name: Create Archive run: | diff --git a/.github/workflows/rust-cli.yml b/.github/workflows/rust-cli.yml index c9cfad8aca..97edb5c689 100644 --- a/.github/workflows/rust-cli.yml +++ b/.github/workflows/rust-cli.yml @@ -24,14 +24,14 @@ jobs: uses: dtolnay/rust-toolchain@stable with: components: clippy - + - name: Prepare Cross run: cargo install cross@0.2.5 # Need to build in container with old version of GLIBC to support RHEL 7 # https://kobzol.github.io/rust/ci/2021/05/07/building-rust-binaries-in-ci-that-work-with-older-glibc.html - name: Build - working-directory: zowex + working-directory: zowex run: cross build --verbose - name: Create Archive @@ -63,9 +63,16 @@ jobs: - name: Install Rust toolchain uses: dtolnay/rust-toolchain@stable + with: + targets: aarch64-apple-darwin - name: Build - run: cargo build --verbose --manifest-path=zowex/Cargo.toml + run: | + cargo build --verbose --target aarch64-apple-darwin --manifest-path=zowex/Cargo.toml + cargo build --verbose --target x86_64-apple-darwin --manifest-path=zowex/Cargo.toml + mkdir -p zowex/target/debug && cd zowex/target/debug + 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 - name: Create Archive run: | @@ -86,7 +93,7 @@ jobs: name: Build Windows runs-on: windows-latest if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]') - + steps: - uses: actions/checkout@v3 diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index c6c3161944..4c13dac147 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -4,9 +4,11 @@ All notable changes to the Zowe CLI package will be documented in this file. ## Recent Changes +- Enhancement: Updated daemon on MacOS to use universal binary which adds support for Apple Silicon. - BugFix: Fixed an issue in the Daemon server which prevents users on Windows with uppercase letters in their username from using the Daemon ## `7.17.0` + - Enhancement: Created zos-files edit commands to edit a dataset or uss file locally [PR #1672](https://github.com/zowe/zowe-cli/pull/1672) ## `7.16.5` @@ -18,7 +20,7 @@ All notable changes to the Zowe CLI package will be documented in this file. ## `7.16.4` -BugFix: Fixed `secondary` option being specified as `1` on `BLANK` type datasets with the `zowe files create data-set` command [#1595](https://github.com/zowe/zowe-cli/issues/1595) +- BugFix: Fixed `secondary` option being specified as `1` on `BLANK` type datasets with the `zowe files create data-set` command [#1595](https://github.com/zowe/zowe-cli/issues/1595) ## `7.16.3` diff --git a/zowex/Cargo.lock b/zowex/Cargo.lock index f1f7293b88..85da560d76 100644 --- a/zowex/Cargo.lock +++ b/zowex/Cargo.lock @@ -772,7 +772,7 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zowe" -version = "1.1.0" +version = "1.2.0" dependencies = [ "base64", "fslock", diff --git a/zowex/Cargo.toml b/zowex/Cargo.toml index dc6ed630ca..04eda478ee 100644 --- a/zowex/Cargo.toml +++ b/zowex/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zowe" -version = "1.1.0" +version = "1.2.0" authors = ["Zowe Project"] edition = "2018" license = "EPL-2.0"