chore: update from next

Signed-off-by: zFernand0 <[email protected]>
zowe · Jun 7, 2024 · cff8984 · cff8984
2 parents da91e26 + 7abeb30
commit cff8984
Show file tree

Hide file tree

Showing 96 changed files with 1,796 additions and 687 deletions.
diff --git a/.github/dco.yml b/.github/dco.yml
@@ -0,0 +1,3 @@
+allowRemediationCommits:
+  individual: true
+  thirdParty: true
diff --git a/.github/workflows/rust-cli-publish.yml b/.github/workflows/rust-cli-publish.yml
@@ -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:
@@ -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
@@ -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: |
@@ -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/.github/workflows/secrets-sdk.yml b/.github/workflows/secrets-sdk.yml
@@ -11,6 +11,7 @@ on:
   pull_request:
     paths:
       - "packages/secrets/**"
+  workflow_dispatch:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -28,10 +29,9 @@ jobs:
         settings:
           - host: macos-latest
             target: x86_64-apple-darwin
-            build: |
-              npm run build
+            build: npm run build -- --target x86_64-apple-darwin
           - host: windows-latest
-            build: npm run build
+            build: npm run build -- --target x86_64-pc-windows-msvc
             target: x86_64-pc-windows-msvc
           - host: windows-latest
             build: |
@@ -66,13 +66,7 @@ jobs:
               CARGO=cross npm run build -- --target x86_64-unknown-linux-musl
           - host: macos-latest
             target: aarch64-apple-darwin
-            build: |
-              sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*;
-              export CC=$(xcrun -f clang);
-              export CXX=$(xcrun -f clang++);
-              SYSROOT=$(xcrun --sdk macosx --show-sdk-path);
-              export CFLAGS="-isysroot $SYSROOT -isystem $SYSROOT";
-              npm run build -- --target aarch64-apple-darwin
+            build: npm run build -- --target aarch64-apple-darwin
           - host: ubuntu-latest
             target: aarch64-unknown-linux-gnu
             use-cross: true
@@ -209,8 +203,11 @@ jobs:
         settings:
           - host: windows-latest
             target: x86_64-pc-windows-msvc
+          - host: macos-latest
+            target: aarch64-apple-darwin
           - host: macos-latest
             target: x86_64-apple-darwin
+            architecture: x64
           - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
           - host: ubuntu-latest
@@ -236,6 +233,7 @@ jobs:
           node-version: ${{ matrix.node }}
           check-latest: true
           cache: npm
+          architecture: ${{ matrix.settings.architecture }}
       - name: Install dependencies
         run: npm ci --ignore-scripts
       - name: Download artifacts

diff --git a/.gitignore b/.gitignore
@@ -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
diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli-test-utils",
-  "version": "8.0.0-next.202405151329",
+  "version": "8.0.0-next.202406061600",
   "description": "Test utilities package for Zowe CLI plug-ins",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/uuid": "^9.0.8",
-    "@zowe/imperative": "8.0.0-next.202405151329"
+    "@zowe/imperative": "8.0.0-next.202406061600"
   },
   "peerDependencies": {
     "@zowe/imperative": "^8.0.0-next"

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "8.0.0-next.202405151329",
+  "version": "8.0.0-next.202406061600",
   "command": {
     "publish": {
       "ignoreChanges": [