Test changes with universal daemon binary

Signed-off-by: Timothy Johnson <[email protected]>
zowe · Jul 31, 2023 · c118144 · c118144
1 parent c4a8e6b
commit c118144
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/.github/workflows/zowe-cli.yml b/.github/workflows/zowe-cli.yml
@@ -31,7 +31,7 @@ jobs:
       fail-fast: false
       matrix:
         node-version: [16.x, 18.x]
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [macos-latest]
 
     env:
       OS: ${{ matrix.os }}
@@ -101,17 +101,21 @@ jobs:
       id: build-binary
       if: matrix.os != 'windows-latest' && (github.event.inputs.test-type == 'binary' || github.event_name == 'push')
       run: |
-        cargo build --verbose ${{ github.event.inputs.binary-type == 'release' && '--release' || '' }} --manifest-path=zowex/Cargo.toml
+        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
         tar -cvzf zowe.tgz -C zowex/target/${{ github.event.inputs.binary-type == 'release' && 'release' || 'debug' }} zowe
 
-    - name: Build Binary (Windows)
-      id: build-windows-binary
-      if: matrix.os == 'windows-latest' && (github.event.inputs.test-type == 'binary' || github.event_name == 'push')
-      run: |
-        cargo build --verbose ${{ github.event.inputs.binary-type == 'release' && '--release' || '' }} --manifest-path=zowex/Cargo.toml
-        tar -cvzf zowe.tgz -C zowex/target/${{ github.event.inputs.binary-type == 'release' && 'release' || 'debug' }} zowe.exe
-      env:
-        RUSTFLAGS: "-Ctarget-feature=+crt-static"
+    # - name: Build Binary (Windows)
+    #   id: build-windows-binary
+    #   if: matrix.os == 'windows-latest' && (github.event.inputs.test-type == 'binary' || github.event_name == 'push')
+    #   run: |
+    #     cargo build --verbose ${{ github.event.inputs.binary-type == 'release' && '--release' || '' }} --manifest-path=zowex/Cargo.toml
+    #     tar -cvzf zowe.tgz -C zowex/target/${{ github.event.inputs.binary-type == 'release' && 'release' || 'debug' }} zowe.exe
+    #   env:
+    #     RUSTFLAGS: "-Ctarget-feature=+crt-static"
 
     - name: Archive Binary
       if: github.event.inputs.test-type == 'binary' || github.event_name == 'push'