From 0bb80b6a74e1d48343195791969561760ac24e86 Mon Sep 17 00:00:00 2001 From: sawka Date: Mon, 8 Jan 2024 00:35:38 -0800 Subject: [PATCH] run both mac builds --- .github/workflows/build-macos-x64.yml | 32 ++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-macos-x64.yml b/.github/workflows/build-macos-x64.yml index 76f5ef0ac..948413ee9 100644 --- a/.github/workflows/build-macos-x64.yml +++ b/.github/workflows/build-macos-x64.yml @@ -2,15 +2,17 @@ name: "Build MacOS x64" on: workflow_dispatch env: WAVETERM_VERSION: 0.5.3 + GO_VERSION: '1.21.5' + NODE_VERSION: '21.5.0' jobs: - runbuild: + runbuild-x64: name: "Build MacOS x64" runs-on: macos-latest steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: - go-version: '1.21.5' + go-version: ${{env.GO_VERSION}} cache-dependency-path: | wavesrv/go.sum waveshell/go.sum @@ -18,7 +20,7 @@ jobs: - run: brew install scripthaus - uses: actions/setup-node@v4 with: - node-version: '21.5.0' + node-version: ${{env.NODE_VERSION}} cache: 'yarn' - run: yarn --frozen-lockfile - run: scripthaus run build-package @@ -27,5 +29,29 @@ jobs: name: waveterm-build-darwin-x64 path: out/make/zip/darwin/x64/*.zip retention-days: 2 + runbuild-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 + - run: brew tap scripthaus-dev/scripthaus + - run: brew install scripthaus + - uses: actions/setup-node@v4 + with: + node-version: ${{env.NODE_VERSION}} + cache: 'yarn' + - run: yarn --frozen-lockfile + - run: scripthaus run build-package + - uses: actions/upload-artifact@v3 + with: + name: waveterm-build-darwin-arm64 + path: out/make/zip/darwin/arm64/*.zip + retention-days: 2