bump to v0.6.1

wavetermdev · Jan 29, 2024 · ea3f744 · ea3f744
1 parent dd3d52e
commit ea3f744
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 49 deletions.
diff --git a/.github/workflows/build-helper.yml b/.github/workflows/build-helper.yml
@@ -1,9 +1,9 @@
 name: "Build Helper"
 on: workflow_dispatch
 env:
-    WAVETERM_VERSION: 0.6.0
-    GO_VERSION: '1.21.5'
-    NODE_VERSION: '21.5.0'
+    WAVETERM_VERSION: 0.6.1
+    GO_VERSION: "1.21.5"
+    NODE_VERSION: "21.5.0"
 jobs:
     runbuild-darwin-x64:
         name: "Build MacOS x64"
@@ -12,47 +12,47 @@ jobs:
             - uses: actions/checkout@v4
             - uses: actions/setup-go@v4
               with:
-                go-version: ${{env.GO_VERSION}}
-                cache-dependency-path: |
-                    wavesrv/go.sum
-                    waveshell/go.sum
+                  go-version: ${{env.GO_VERSION}}
+                  cache-dependency-path: |
+                      wavesrv/go.sum
+                      waveshell/go.sum
             - run: brew tap scripthaus-dev/scripthaus
             - run: brew install scripthaus
             - uses: actions/setup-node@v4
               with:
-                node-version: ${{env.NODE_VERSION}}
-                cache: 'yarn'
+                  node-version: ${{env.NODE_VERSION}}
+                  cache: "yarn"
             - run: yarn --frozen-lockfile
             - run: scripthaus run build-package
             - uses: actions/upload-artifact@v4
               with:
-                name: waveterm-build-darwin-x64
-                path: out/make/zip/darwin/x64/*.zip
-                retention-days: 2
+                  name: waveterm-build-darwin-x64
+                  path: out/make/zip/darwin/x64/*.zip
+                  retention-days: 2
     runbuild-darwin-arm64:
         name: "Build MacOS arm64"
         runs-on: macos-latest-xlarge
         steps:
             - uses: actions/checkout@v4
             - uses: actions/setup-go@v4
               with:
-                go-version: ${{env.GO_VERSION}}
-                cache-dependency-path: |
-                    wavesrv/go.sum
-                    waveshell/go.sum
+                  go-version: ${{env.GO_VERSION}}
+                  cache-dependency-path: |
+                      wavesrv/go.sum
+                      waveshell/go.sum
             - run: brew tap scripthaus-dev/scripthaus
             - run: brew install scripthaus
             - uses: actions/setup-node@v4
               with:
-                node-version: ${{env.NODE_VERSION}}
-                cache: 'yarn'
+                  node-version: ${{env.NODE_VERSION}}
+                  cache: "yarn"
             - run: yarn --frozen-lockfile
             - run: scripthaus run build-package
             - uses: actions/upload-artifact@v4
               with:
-                name: waveterm-build-darwin-arm64
-                path: out/make/zip/darwin/arm64/*.zip
-                retention-days: 2
+                  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
@@ -61,42 +61,40 @@ jobs:
             - uses: actions/checkout@v4
             - uses: actions/checkout@v4
               with:
-                repository: scripthaus-dev/scripthaus
-                path: scripthaus
+                  repository: scripthaus-dev/scripthaus
+                  path: scripthaus
             - uses: actions/setup-go@v4
               with:
-                go-version: ${{env.GO_VERSION}}
-                cache-dependency-path: |
-                    wavesrv/go.sum
-                    waveshell/go.sum
-                    scripthaus/go.sum
+                  go-version: ${{env.GO_VERSION}}
+                  cache-dependency-path: |
+                      wavesrv/go.sum
+                      waveshell/go.sum
+                      scripthaus/go.sum
             - run: |
-                go work use ./scripthaus;
-                cd scripthaus;
-                go get ./...;
-                CGO_ENABLED=1 go build -o scripthaus cmd/main.go
+                  go work use ./scripthaus;
+                  cd scripthaus;
+                  go get ./...;
+                  CGO_ENABLED=1 go build -o scripthaus cmd/main.go
             - uses: actions/setup-node@v4
               with:
-                node-version: ${{env.NODE_VERSION}}
-                cache: 'yarn'
+                  node-version: ${{env.NODE_VERSION}}
+                  cache: "yarn"
             - run: yarn --frozen-lockfile
             - run: ./scripthaus/scripthaus run build-package-linux
             - uses: actions/download-artifact@v4
               with:
-                merge-multiple: true
-                path: buildtemp
+                  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
+                  mv out/make/zip/linux/x64/Wave-linux-x64-$WAVETERM_VERSION.zip buildtemp/waveterm-linux-x64-v$WAVETERM_VERSION.zip
             - run: (cd buildtemp; zip ../waveterm-builds.zip *)
             - run: aws s3 cp waveterm-builds.zip s3://waveterm-github-artifacts/
               env:
-                AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
-                AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"
-                AWS_DEFAULT_REGION: us-west-2
+                  AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
+                  AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"
+                  AWS_DEFAULT_REGION: us-west-2
             - uses: actions/upload-artifact@v4
               with:
-                name: waveterm-builds
-                path: buildtemp
-                retention-days: 2
-
-
+                  name: waveterm-builds
+                  path: buildtemp
+                  retention-days: 2
diff --git 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.0
+VERSION=0.6.1
 rm -rf temp
 rm -rf builds
 mkdir temp

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "waveterm",
     "author": "Command Line Inc",
     "productName": "Wave",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "main": "dist/emain.js",
     "license": "Apache-2.0",
     "dependencies": {

diff --git a/version.js b/version.js
@@ -1,2 +1,2 @@
-const VERSION = "v0.6.0";
+const VERSION = "v0.6.1";
 module.exports = VERSION;
diff --git 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.6.0"
+const WaveVersion = "v0.6.1"
 const WaveAuthKeyFileName = "waveterm.authkey"
 const MShellVersion = "v0.4.0"