From a7afefc340e86906bf97cf5a214e4a9ab65902af Mon Sep 17 00:00:00 2001
From: sawka <mike.sawka@gmail.com>
Date: Tue, 16 Jan 2024 22:35:17 -0800
Subject: [PATCH] update build-helper.yml (single artifact with all builds)

---
 .github/workflows/build-helper.yml | 24 +++++++++++++++---------
 buildres/build-universal.sh        |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-helper.yml b/.github/workflows/build-helper.yml
index 10601891..8007c121 100644
--- a/.github/workflows/build-helper.yml
+++ b/.github/workflows/build-helper.yml
@@ -5,7 +5,7 @@ env:
     GO_VERSION: '1.21.5'
     NODE_VERSION: '21.5.0'
 jobs:
-    runbuild-x64:
+    runbuild-darwin-x64:
         name: "Build MacOS x64"
         runs-on: macos-latest
         steps:
@@ -24,13 +24,12 @@ jobs:
                 cache: 'yarn'
             - run: yarn --frozen-lockfile
             - run: scripthaus run build-package
-            - uses: actions/upload-artifact@v3
+            - uses: actions/upload-artifact@v4
               with:
                 name: waveterm-build-darwin-x64
                 path: out/make/zip/darwin/x64/*.zip
                 retention-days: 2
-    runbuild-arm64:
-        if: false
+    runbuild-darwin-arm64:
         name: "Build MacOS arm64"
         runs-on: macos-latest-xlarge
         steps:
@@ -49,7 +48,7 @@ jobs:
                 cache: 'yarn'
             - run: yarn --frozen-lockfile
             - run: scripthaus run build-package
-            - uses: actions/upload-artifact@v3
+            - uses: actions/upload-artifact@v4
               with:
                 name: waveterm-build-darwin-arm64
                 path: out/make/zip/darwin/arm64/*.zip
@@ -57,6 +56,7 @@ jobs:
     runbuild-linux:
         name: "Build Linux x64"
         runs-on: ubuntu-latest
+        needs: [runbuild-darwin-x64, runbuild-darwin-arm64]
         steps:
             - uses: actions/checkout@v4
             - uses: actions/checkout@v4
@@ -74,17 +74,23 @@ jobs:
                 go work use ./scripthaus;
                 cd scripthaus;
                 go get ./...;
-                CGO_ENABLED=1 go build -o ../scripthaus cmd/main.go
+                CGO_ENABLED=1 go build -o scripthaus cmd/main.go
             - uses: actions/setup-node@v4
               with:
                 node-version: ${{env.NODE_VERSION}}
                 cache: 'yarn'
             - run: yarn --frozen-lockfile
-            - run: ./scripthaus run build-package-linux
-            - uses: actions/upload-artifact@v3
+            - run: ./scripthaus/scripthaus run build-package-linux
+            - uses: actions/download-artifact@v4
+              with:
+                merge-multiple: true
+                path: buildtemp
+            - run: |
+                mv out/make/zip/linux/x64/Wave-linux-x64-$WAVETERM_VERSION.zip buildtemp/waveterm-linux-x64-v$WAVETERM_VERSION.zip
+            - uses: actions/upload-artifact@v4
               with:
                 name: waveterm-build-linux-x64
-                path: out/make/zip/linux/x64/*.zip
+                path: buildtemp
                 retention-days: 2
 
 
diff --git a/buildres/build-universal.sh b/buildres/build-universal.sh
index eae2964c..a8805e80 100644
--- a/buildres/build-universal.sh
+++ b/buildres/build-universal.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # assumes we have Wave-darwin-x64-[version].zip and Wave-darwin-arm64-[version].zip in current directory
-VERSION=0.6.3
+VERSION=0.6.0
 rm -rf temp
 mkdir temp
 mkdir temp/x64