Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-02 18:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

bump to v0.6.1

Browse Source
This commit is contained in:
sawka 2024-01-29 09:39:36 -08:00
parent dd3d52e47d
commit ea3f744d93
5 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
.github/workflows/build-helper.yml vendored
View File

@ -1,9 +1,9 @@
name: "Build Helper" name: "Build Helper"
on: workflow_dispatch on: workflow_dispatch
env: env:
WAVETERM_VERSION: 0.6.0 WAVETERM_VERSION: 0.6.1
GO_VERSION: '1.21.5' GO_VERSION: "1.21.5"
NODE_VERSION: '21.5.0' NODE_VERSION: "21.5.0"
jobs: jobs:
runbuild-darwin-x64: runbuild-darwin-x64:
name: "Build MacOS x64" name: "Build MacOS x64"
@ -12,23 +12,23 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: ${{env.GO_VERSION}} go-version: ${{env.GO_VERSION}}
cache-dependency-path: | cache-dependency-path: |
wavesrv/go.sum wavesrv/go.sum
waveshell/go.sum waveshell/go.sum
- run: brew tap scripthaus-dev/scripthaus - run: brew tap scripthaus-dev/scripthaus
- run: brew install scripthaus - run: brew install scripthaus
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: ${{env.NODE_VERSION}} node-version: ${{env.NODE_VERSION}}
cache: 'yarn' cache: "yarn"
- run: yarn --frozen-lockfile - run: yarn --frozen-lockfile
- run: scripthaus run build-package - run: scripthaus run build-package
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
with: with:
name: waveterm-build-darwin-x64 name: waveterm-build-darwin-x64
path: out/make/zip/darwin/x64/*.zip path: out/make/zip/darwin/x64/*.zip
retention-days: 2 retention-days: 2
runbuild-darwin-arm64: runbuild-darwin-arm64:
name: "Build MacOS arm64" name: "Build MacOS arm64"
runs-on: macos-latest-xlarge runs-on: macos-latest-xlarge
@ -36,23 +36,23 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: ${{env.GO_VERSION}} go-version: ${{env.GO_VERSION}}
cache-dependency-path: | cache-dependency-path: |
wavesrv/go.sum wavesrv/go.sum
waveshell/go.sum waveshell/go.sum
- run: brew tap scripthaus-dev/scripthaus - run: brew tap scripthaus-dev/scripthaus
- run: brew install scripthaus - run: brew install scripthaus
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: ${{env.NODE_VERSION}} node-version: ${{env.NODE_VERSION}}
cache: 'yarn' cache: "yarn"
- run: yarn --frozen-lockfile - run: yarn --frozen-lockfile
- run: scripthaus run build-package - run: scripthaus run build-package
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
with: with:
name: waveterm-build-darwin-arm64 name: waveterm-build-darwin-arm64
path: out/make/zip/darwin/arm64/*.zip path: out/make/zip/darwin/arm64/*.zip
retention-days: 2 retention-days: 2
runbuild-linux: runbuild-linux:
name: "Build Linux x64" name: "Build Linux x64"
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -61,42 +61,40 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
repository: scripthaus-dev/scripthaus repository: scripthaus-dev/scripthaus
path: scripthaus path: scripthaus
- uses: actions/setup-go@v4 - uses: actions/setup-go@v4
with: with:
go-version: ${{env.GO_VERSION}} go-version: ${{env.GO_VERSION}}
cache-dependency-path: | cache-dependency-path: |
wavesrv/go.sum wavesrv/go.sum
waveshell/go.sum waveshell/go.sum
scripthaus/go.sum scripthaus/go.sum
- run: | - run: |
go work use ./scripthaus; go work use ./scripthaus;
cd scripthaus; cd scripthaus;
go get ./...; 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 - uses: actions/setup-node@v4
with: with:
node-version: ${{env.NODE_VERSION}} node-version: ${{env.NODE_VERSION}}
cache: 'yarn' cache: "yarn"
- run: yarn --frozen-lockfile - run: yarn --frozen-lockfile
- run: ./scripthaus/scripthaus run build-package-linux - run: ./scripthaus/scripthaus run build-package-linux
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
with: with:
merge-multiple: true merge-multiple: true
path: buildtemp path: buildtemp
- run: | - 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: (cd buildtemp; zip ../waveterm-builds.zip *)
- run: aws s3 cp waveterm-builds.zip s3://waveterm-github-artifacts/ - run: aws s3 cp waveterm-builds.zip s3://waveterm-github-artifacts/
env: env:
AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}" AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}" AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"
AWS_DEFAULT_REGION: us-west-2 AWS_DEFAULT_REGION: us-west-2
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
with: with:
name: waveterm-builds name: waveterm-builds
path: buildtemp path: buildtemp
retention-days: 2 retention-days: 2

2
buildres/build-universal.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# assumes we have Wave-darwin-x64-[version].zip and Wave-darwin-arm64-[version].zip in current directory # 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 temp
rm -rf builds rm -rf builds
mkdir temp mkdir temp

2
package.json
View File

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

2
version.js
View File

@ -1,2 +1,2 @@
const VERSION = "v0.6.0"; const VERSION = "v0.6.1";
module.exports = VERSION; module.exports = VERSION;

2
wavesrv/pkg/scbase/scbase.go
View File

@ -35,7 +35,7 @@ const WaveLockFile = "waveterm.lock"
const WaveDirName = ".waveterm" // must match emain.ts const WaveDirName = ".waveterm" // must match emain.ts
const WaveDevDirName = ".waveterm-dev" // must match emain.ts const WaveDevDirName = ".waveterm-dev" // must match emain.ts
const WaveAppPathVarName = "WAVETERM_APP_PATH" const WaveAppPathVarName = "WAVETERM_APP_PATH"
const WaveVersion = "v0.6.0" const WaveVersion = "v0.6.1"
const WaveAuthKeyFileName = "waveterm.authkey" const WaveAuthKeyFileName = "waveterm.authkey"
const MShellVersion = "v0.4.0" const MShellVersion = "v0.4.0"