From 13cd9dfe508eb03247d7f6145084319cae97ebdf Mon Sep 17 00:00:00 2001
From: sawka <mike.sawka@gmail.com>
Date: Tue, 16 Jan 2024 20:37:46 -0800
Subject: [PATCH] bump to version v0.6.0, testing linux in build workflow

---
 .../{build-macos-x64.yml => build-helper.yml} | 34 +++++++++++++++++--
 buildres/build-universal.sh                   |  2 +-
 package.json                                  |  2 +-
 src/app/workspace/cmdinput/textareainput.tsx  |  1 -
 version.js                                    |  2 +-
 wavesrv/pkg/scbase/scbase.go                  |  2 +-
 6 files changed, 36 insertions(+), 7 deletions(-)
 rename .github/workflows/{build-macos-x64.yml => build-helper.yml} (61%)

diff --git a/.github/workflows/build-macos-x64.yml b/.github/workflows/build-helper.yml
similarity index 61%
rename from .github/workflows/build-macos-x64.yml
rename to .github/workflows/build-helper.yml
index 948413ee..96856ec1 100644
--- a/.github/workflows/build-macos-x64.yml
+++ b/.github/workflows/build-helper.yml
@@ -1,7 +1,7 @@
-name: "Build MacOS x64"
+name: "Build Helper"
 on: workflow_dispatch
 env:
-    WAVETERM_VERSION: 0.5.3
+    WAVETERM_VERSION: 0.6.0
     GO_VERSION: '1.21.5'
     NODE_VERSION: '21.5.0'
 jobs:
@@ -30,6 +30,7 @@ jobs:
                 path: out/make/zip/darwin/x64/*.zip
                 retention-days: 2
     runbuild-arm64:
+        if: false
         name: "Build MacOS arm64"
         runs-on: macos-latest-xlarge
         steps:
@@ -53,5 +54,34 @@ jobs:
                 name: waveterm-build-darwin-arm64
                 path: out/make/zip/darwin/arm64/*.zip
                 retention-days: 2
+    runbuild-linux:
+        name: "Build Linux x64"
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/checkout@v4
+              with:
+                repository: scripthaus-dev/scripthaus
+                path: scripthaus
+            - working-directory: scripthaus
+              run: CGO_ENABLED=1 go build -o ../scripthaus cmd/main.go
+            - uses: actions/setup-go@v4
+              with:
+                go-version: ${{env.GO_VERSION}}
+                cache-dependency-path: |
+                    wavesrv/go.sum
+                    waveshell/go.sum
+                    scripthaus/go.sum
+            - 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
+              with:
+                name: waveterm-build-linux-x64
+                path: out/make/zip/linux/x64/*.zip
+                retention-days: 2
 
 
diff --git a/buildres/build-universal.sh b/buildres/build-universal.sh
index 67c96c10..eae2964c 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.5.3
+VERSION=0.6.3
 rm -rf temp
 mkdir temp
 mkdir temp/x64
diff --git a/package.json b/package.json
index 472eabd0..9afacb21 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "waveterm",
     "author": "Command Line Inc",
     "productName": "Wave",
-    "version": "0.5.3",
+    "version": "0.6.0",
     "main": "dist/emain.js",
     "license": "Apache-2.0",
     "dependencies": {
diff --git a/src/app/workspace/cmdinput/textareainput.tsx b/src/app/workspace/cmdinput/textareainput.tsx
index eb1a550b..b6036a67 100644
--- a/src/app/workspace/cmdinput/textareainput.tsx
+++ b/src/app/workspace/cmdinput/textareainput.tsx
@@ -591,7 +591,6 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
         let screen = GlobalModel.getActiveScreen();
         if (screen != null) {
             let ri = screen.getCurRemoteInstance();
-            console.log("got ri", ri);
             if (ri != null && ri.shelltype != null) {
                 shellType = ri.shelltype;
             }
diff --git a/version.js b/version.js
index e59a1523..ad43ed8a 100644
--- a/version.js
+++ b/version.js
@@ -1,2 +1,2 @@
-const VERSION = "v0.5.3";
+const VERSION = "v0.6.0";
 module.exports = VERSION;
diff --git a/wavesrv/pkg/scbase/scbase.go b/wavesrv/pkg/scbase/scbase.go
index 19892b9a..be937e8a 100644
--- a/wavesrv/pkg/scbase/scbase.go
+++ b/wavesrv/pkg/scbase/scbase.go
@@ -35,7 +35,7 @@ const WaveLockFile = "waveterm.lock"
 const WaveDirName = ".waveterm"        // must match emain.ts
 const WaveDevDirName = ".waveterm-dev" // must match emain.ts
 const WaveAppPathVarName = "WAVETERM_APP_PATH"
-const WaveVersion = "v0.5.3"
+const WaveVersion = "v0.6.0"
 const WaveAuthKeyFileName = "waveterm.authkey"
 const MShellVersion = "v0.4.0"