From 964751aae11376117e642806f6bbb199f4f42ceb Mon Sep 17 00:00:00 2001 From: Mike Sawka Date: Wed, 27 Mar 2024 14:27:55 -0700 Subject: [PATCH] bump version to v0.7.2, bump waveshell version to 0.6 (#512) --- package.json | 2 +- scripthaus.md | 6 +++--- waveshell/main-waveshell.go | 1 + waveshell/pkg/base/base.go | 2 +- wavesrv/pkg/scbase/scbase.go | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 0c7126a8..87320764 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ }, "productName": "Wave", "description": "An Open-Source, AI-Native, Terminal Built for Seamless Workflows", - "version": "0.7.1", + "version": "0.7.2", "main": "dist/emain.js", "license": "Apache-2.0", "repository": { diff --git a/scripthaus.md b/scripthaus.md index edff3608..21785bc9 100644 --- a/scripthaus.md +++ b/scripthaus.md @@ -44,7 +44,7 @@ rm -rf bin/ rm -rf build/ node_modules/.bin/webpack --env prod WAVESRV_VERSION=$(node -e 'console.log(require("./version.js"))') -WAVESHELL_VERSION=v0.5 +WAVESHELL_VERSION=v0.6 GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')" function buildWaveShell { (cd waveshell; CGO_ENABLED=0 GOOS=$1 GOARCH=$2 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-$WAVESHELL_VERSION-$1.$2 main-waveshell.go) @@ -69,7 +69,7 @@ rm -rf bin/ rm -rf build/ node_modules/.bin/webpack --env prod WAVESRV_VERSION=$(node -e 'console.log(require("./version.js"))') -WAVESHELL_VERSION=v0.5 +WAVESHELL_VERSION=v0.6 GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')" function buildWaveShell { (cd waveshell; CGO_ENABLED=0 GOOS=$1 GOARCH=$2 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-$WAVESHELL_VERSION-$1.$2 main-waveshell.go) @@ -96,7 +96,7 @@ CGO_ENABLED=1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflag ```bash # @scripthaus command fullbuild-waveshell set -e -WAVESHELL_VERSION=v0.5 +WAVESHELL_VERSION=v0.6 GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')" function buildWaveShell { (cd waveshell; CGO_ENABLED=0 GOOS=$1 GOARCH=$2 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-$WAVESHELL_VERSION-$1.$2 main-waveshell.go) diff --git a/waveshell/main-waveshell.go b/waveshell/main-waveshell.go index 8e122885..64a8bf7c 100644 --- a/waveshell/main-waveshell.go +++ b/waveshell/main-waveshell.go @@ -17,6 +17,7 @@ import ( "github.com/wavetermdev/waveterm/waveshell/pkg/wlog" ) +// this is set from build/linker flags var BuildTime = "0" func readFullRunPacket(packetParser *packet.PacketParser) (*packet.RunPacketType, error) { diff --git a/waveshell/pkg/base/base.go b/waveshell/pkg/base/base.go index a66d4c4a..71cb12a2 100644 --- a/waveshell/pkg/base/base.go +++ b/waveshell/pkg/base/base.go @@ -29,7 +29,7 @@ const SSHCommandVarName = "SSH_COMMAND" const MShellDebugVarName = "MSHELL_DEBUG" const SessionsDirBaseName = "sessions" const RcFilesDirBaseName = "rcfiles" -const MShellVersion = "v0.5.0" +const MShellVersion = "v0.6.0" const RemoteIdFile = "remoteid" const DefaultMShellInstallBinDir = "/opt/mshell/bin" const LogFileName = "mshell.log" diff --git a/wavesrv/pkg/scbase/scbase.go b/wavesrv/pkg/scbase/scbase.go index cf8794bc..6c69a7b8 100644 --- a/wavesrv/pkg/scbase/scbase.go +++ b/wavesrv/pkg/scbase/scbase.go @@ -36,7 +36,7 @@ const WaveDirName = ".waveterm" // must match emain.ts const WaveDevDirName = ".waveterm-dev" // must match emain.ts const WaveAppPathVarName = "WAVETERM_APP_PATH" const WaveAuthKeyFileName = "waveterm.authkey" -const MShellVersion = "v0.5.0" +const MShellVersion = "v0.6.0" // must match base.MShellVersion // initialized by InitialzeWaveAuthKey (called by main-server) var WaveAuthKey string