Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into merge-master-into-next
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew W. Harn <[email protected]>
  • Loading branch information
awharn committed May 15, 2024
2 parents 2b5d03a + d206684 commit 580ba8a
Show file tree
Hide file tree
Showing 66 changed files with 1,163 additions and 452 deletions.
3 changes: 3 additions & 0 deletions .github/dco.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
allowRemediationCommits:
individual: true
thirdParty: true
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
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,4 @@ packages/imperative/web-help/dist/css/bundle*
packages/imperative/web-help/dist/js/

jest-stare/

jest.user.config.js
jest.user.config.js
Loading

0 comments on commit 580ba8a

Please sign in to comment.