diff --git a/.github/workflows/build-helper.yml b/.github/workflows/build-helper.yml index eadb18ce77..e8a738a5ca 100644 --- a/.github/workflows/build-helper.yml +++ b/.github/workflows/build-helper.yml @@ -1,81 +1,46 @@ -# Build Helper workflow - Builds, signs, and packages binaries for each supported platform, then uploads to a staging bucket in S3 for wider distribution. -# For more information on the macOS signing and notarization, see https://www.electron.build/code-signing and https://www.electron.build/configuration/mac -# For more information on the Windows Code Signing, see https://docs.digicert.com/en/digicert-keylocker/ci-cd-integrations/plugins/github-custom-action-for-keypair-signing.html and https://docs.digicert.com/en/digicert-keylocker/signing-tools/sign-authenticode-with-electron-builder-using-ksp-integration.html +name: Personal macOS Build +run-name: Build macOS from ${{ github.ref_name }} -name: Build Helper -run-name: Build ${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && ' - Manual' || '' }} on: - push: - tags: - - "v[0-9]+.[0-9]+.[0-9]+*" workflow_dispatch: + +permissions: + contents: read + +concurrency: + group: personal-macos-build-${{ github.ref }} + cancel-in-progress: true + env: GO_VERSION: "1.25.6" - NODE_VERSION: 22 - NODE_OPTIONS: --max-old-space-size=4096 -jobs: - build-app: - outputs: - version: ${{ steps.set-version.outputs.WAVETERM_VERSION }} - strategy: - matrix: - include: - - platform: "darwin" - runner: "macos-latest" - - platform: "linux" - runner: "ubuntu-latest" - - platform: "linux" - runner: ubuntu-24.04-arm - - platform: "windows" - runner: "windows-latest" - # - platform: "windows" - # runner: "windows-11-arm64-16core" - runs-on: ${{ matrix.runner }} - steps: - - uses: actions/checkout@v6 - - name: Install Linux Build Dependencies (Linux only) - if: matrix.platform == 'linux' - run: | - sudo apt-get update - sudo apt-get install --no-install-recommends -y libarchive-tools libopenjp2-tools rpm squashfs-tools - sudo snap install snapcraft --classic - sudo snap install lxd - sudo lxd init --auto - sudo snap refresh - - name: Install Zig (not Mac) - if: matrix.platform != 'darwin' - uses: mlugg/setup-zig@v2 + NODE_VERSION: "22" + NODE_OPTIONS: "--max-old-space-size=4096" - # The pre-installed version of the AWS CLI has a segfault problem so we'll install it via Homebrew instead. - - name: Upgrade AWS CLI (Mac only) - if: matrix.platform == 'darwin' - run: brew install awscli +jobs: + build-macos: + name: Build unsigned macOS packages + runs-on: macos-latest + timeout-minutes: 120 - # The version of FPM that comes bundled with electron-builder doesn't include a Linux ARM target. Installing Gems onto the runner is super quick so we'll just do this for all targets. - - name: Install FPM (not Windows) - if: matrix.platform != 'windows' - run: sudo gem install fpm - - name: Install FPM (Windows only) - if: matrix.platform == 'windows' - run: gem install fpm + steps: + - name: Check out source + uses: actions/checkout@v6 - # General build dependencies - - uses: actions/setup-go@v6 + - name: Set up Go + uses: actions/setup-go@v6 with: - go-version: ${{env.GO_VERSION}} - cache-dependency-path: | - go.sum - - uses: actions/setup-node@v6 + go-version: ${{ env.GO_VERSION }} + cache-dependency-path: go.sum + + - name: Set up Node.js + uses: actions/setup-node@v6 with: - node-version: ${{env.NODE_VERSION}} + node-version: ${{ env.NODE_VERSION }} cache: npm cache-dependency-path: package-lock.json - - name: Force git deps to HTTPS - run: | - git config --global url.https://github.com/.insteadof ssh://git@github.com/ - git config --global url.https://github.com/.insteadof git@github.com: - - uses: nick-fields/retry@v4 - name: npm ci + + - name: Install dependencies + uses: nick-fields/retry@v4 with: command: npm ci --no-audit --no-fund retry_on: error @@ -84,126 +49,22 @@ jobs: env: GIT_ASKPASS: "echo" GIT_TERMINAL_PROMPT: "0" + - name: Install Task uses: arduino/setup-task@v2 with: version: 3.x repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: "Set Version" - id: set-version - run: echo "WAVETERM_VERSION=$(task version)" >> "$GITHUB_OUTPUT" - shell: bash - - # Windows Code Signing Setup - - name: Set up certificate (Windows only) - if: matrix.platform == 'windows' && github.event_name != 'workflow_dispatch' - run: | - echo "${{ secrets.SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12 - shell: bash - - name: Set signing variables (Windows only) - if: matrix.platform == 'windows' && github.event_name != 'workflow_dispatch' - id: variables - run: | - echo "SM_HOST=${{ secrets.SM_HOST }}" >> "$GITHUB_ENV" - echo "SM_API_KEY=${{ secrets.SM_API_KEY }}" >> "$GITHUB_ENV" - echo "SM_CODE_SIGNING_CERT_SHA1_HASH=${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}" >> "$GITHUB_ENV" - echo "SM_CLIENT_CERT_FILE=D:\\Certificate_pkcs12.p12" >> "$GITHUB_ENV" - echo "SM_CLIENT_CERT_FILE=D:\\Certificate_pkcs12.p12" >> "$GITHUB_OUTPUT" - echo "SM_CLIENT_CERT_PASSWORD=${{ secrets.SM_CLIENT_CERT_PASSWORD }}" >> "$GITHUB_ENV" - echo "C:\Program Files (x86)\Windows Kits\10\App Certification Kit" >> $GITHUB_PATH - echo "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools" >> $GITHUB_PATH - echo "C:\Program Files\DigiCert\DigiCert Keylocker Tools" >> $GITHUB_PATH - shell: bash - - name: Setup Keylocker KSP (Windows only) - if: matrix.platform == 'windows' && github.event_name != 'workflow_dispatch' - run: | - curl -X GET https://one.digicert.com/signingmanager/api-ui/v1/releases/Keylockertools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o Keylockertools-windows-x64.msi - msiexec /i Keylockertools-windows-x64.msi /quiet /qn - C:\Windows\System32\certutil.exe -csp "DigiCert Signing Manager KSP" -key -user - smctl windows certsync - shell: cmd - - # Build and upload packages - - name: Build (Linux) - if: matrix.platform == 'linux' + - name: Build macOS packages run: task package - env: - USE_SYSTEM_FPM: true # Ensure that the installed version of FPM is used rather than the bundled one. - SNAPCRAFT_BUILD_ENVIRONMENT: host - # Retry Darwin build in case of notarization failures - - uses: nick-fields/retry@v4 - name: Build (Darwin) - if: matrix.platform == 'darwin' - with: - command: task package - timeout_minutes: 120 - retry_on: error - max_attempts: 3 - env: - USE_SYSTEM_FPM: true # Ensure that the installed version of FPM is used rather than the bundled one. - CSC_LINK: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_CERTIFICATE_2}} - CSC_KEY_PASSWORD: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_CERTIFICATE_PWD_2 }} - APPLE_ID: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_APPLE_ID_2 }} - APPLE_APP_SPECIFIC_PASSWORD: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_PWD_2 }} - APPLE_TEAM_ID: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_TEAM_ID_2 }} - STATIC_DOCSITE_PATH: ${{env.STATIC_DOCSITE_PATH}} - - name: Build (Windows) - if: matrix.platform == 'windows' - run: task package - env: - USE_SYSTEM_FPM: true # Ensure that the installed version of FPM is used rather than the bundled one. - CSC_LINK: ${{ steps.variables.outputs.SM_CLIENT_CERT_FILE }} - CSC_KEY_PASSWORD: ${{ secrets.SM_CLIENT_CERT_PASSWORD }} - STATIC_DOCSITE_PATH: ${{env.STATIC_DOCSITE_PATH}} - shell: powershell # electron-builder's Windows code signing package has some compatibility issues with pwsh, so we need to use Windows Powershell - # Upload artifacts to the S3 staging and to the workflow output for the draft release job - - name: Upload to S3 staging - if: github.event_name != 'workflow_dispatch' - run: task artifacts:upload - env: - AWS_ACCESS_KEY_ID: "${{ secrets.ARTIFACTS_KEY_ID }}" - AWS_SECRET_ACCESS_KEY: "${{ secrets.ARTIFACTS_KEY_SECRET }}" - AWS_DEFAULT_REGION: us-west-2 - - name: Upload artifacts + - name: Upload DMG and ZIP packages uses: actions/upload-artifact@v5 with: - name: ${{ matrix.runner }} - path: make - - name: Upload Snapcraft logs on failure - if: failure() - uses: actions/upload-artifact@v5 - with: - name: ${{ matrix.runner }}-log - path: /home/runner/.local/state/snapcraft/log - create-release: - runs-on: ubuntu-latest - needs: build-app - permissions: - contents: write - if: ${{ github.event_name != 'workflow_dispatch' }} - steps: - - name: Download artifacts - uses: actions/download-artifact@v4 - with: - path: make - merge-multiple: true - - name: Create draft release - uses: softprops/action-gh-release@v2 - with: - prerelease: ${{ contains(github.ref_name, '-beta') }} - name: Wave Terminal ${{ github.ref_name }} Release - generate_release_notes: true - draft: true - files: | - make/*.zip + name: Wave-macOS-${{ github.sha }} + path: | make/*.dmg - make/*.exe - make/*.msi - make/*.rpm - make/*.deb - make/*.pacman - make/*.snap - make/*.flatpak - make/*.AppImage + make/*.zip + if-no-files-found: error + retention-days: 14 diff --git a/docs/docs/config.mdx b/docs/docs/config.mdx index 05389e99ef..ad8b81d64e 100644 --- a/docs/docs/config.mdx +++ b/docs/docs/config.mdx @@ -99,6 +99,7 @@ wsh editconfig | widget:showhelp | bool | whether to show help/tips widgets in right sidebar | | window:transparent | bool | set to true to enable window transparency (cannot be combined with `window:blur`) (macOS and Windows only, requires app restart, see [note on Windows compatibility](https://www.electronjs.org/docs/latest/tutorial/custom-window-styles#limitations)) | | window:blur | bool | set to enable window background blurring (cannot be combined with `window:transparent`) (macOS and Windows only, requires app restart, see [note on Windows compatibility](https://www.electronjs.org/docs/latest/tutorial/custom-window-styles#limitations)) | +| window:visualeffectstate | string | controls whether macOS vibrancy follows window focus (`followWindow`, default), always appears active (`active`), or always appears inactive (`inactive`); macOS only, ignored on other platforms, requires `window:blur` and an app restart | | window:opacity | float64 | 0-1, window opacity when `window:transparent` or `window:blur` are set | | window:bgcolor | string | set the window background color (should be hex: #xxxxxx) | | window:reducedmotion | bool | set to true to disable most animations | diff --git a/emain/emain-window.ts b/emain/emain-window.ts index e3bfa87751..8e30b49e5a 100644 --- a/emain/emain-window.ts +++ b/emain/emain-window.ts @@ -180,6 +180,11 @@ export class WaveBrowserWindow extends BaseWindow { winOpts.transparent = true; } else if (isBlur) { winOpts.vibrancy = "fullscreen-ui"; + const visualEffectState = settings?.["window:visualeffectstate"]; + winOpts.visualEffectState = + visualEffectState === "active" || visualEffectState === "inactive" + ? visualEffectState + : "followWindow"; } else { winOpts.backgroundColor = "#222222"; } diff --git a/frontend/types/gotypes.d.ts b/frontend/types/gotypes.d.ts index c5b870d7ed..513eff19be 100644 --- a/frontend/types/gotypes.d.ts +++ b/frontend/types/gotypes.d.ts @@ -1453,6 +1453,7 @@ declare global { "window:fullscreenonlaunch"?: boolean; "window:transparent"?: boolean; "window:blur"?: boolean; + "window:visualeffectstate"?: string; "window:opacity"?: number; "window:bgcolor"?: string; "window:reducedmotion"?: boolean; diff --git a/pkg/wconfig/metaconsts.go b/pkg/wconfig/metaconsts.go index 7d5bba5d9d..c10f8d47d5 100644 --- a/pkg/wconfig/metaconsts.go +++ b/pkg/wconfig/metaconsts.go @@ -96,6 +96,7 @@ const ( ConfigKey_WindowFullscreenOnLaunch = "window:fullscreenonlaunch" ConfigKey_WindowTransparent = "window:transparent" ConfigKey_WindowBlur = "window:blur" + ConfigKey_WindowVisualEffectState = "window:visualeffectstate" ConfigKey_WindowOpacity = "window:opacity" ConfigKey_WindowBgColor = "window:bgcolor" ConfigKey_WindowReducedMotion = "window:reducedmotion" diff --git a/pkg/wconfig/settingsconfig.go b/pkg/wconfig/settingsconfig.go index 67118b1670..4c5b0690b0 100644 --- a/pkg/wconfig/settingsconfig.go +++ b/pkg/wconfig/settingsconfig.go @@ -147,6 +147,7 @@ type SettingsType struct { WindowFullscreenOnLaunch bool `json:"window:fullscreenonlaunch,omitempty"` WindowTransparent bool `json:"window:transparent,omitempty"` WindowBlur bool `json:"window:blur,omitempty"` + WindowVisualEffectState string `json:"window:visualeffectstate,omitempty" jsonschema:"enum=followWindow,enum=active,enum=inactive"` WindowOpacity *float64 `json:"window:opacity,omitempty"` WindowBgColor string `json:"window:bgcolor,omitempty"` WindowReducedMotion bool `json:"window:reducedmotion,omitempty"` diff --git a/schema/settings.json b/schema/settings.json index f341a0f365..ea42563929 100644 --- a/schema/settings.json +++ b/schema/settings.json @@ -259,6 +259,14 @@ "window:blur": { "type": "boolean" }, + "window:visualeffectstate": { + "type": "string", + "enum": [ + "followWindow", + "active", + "inactive" + ] + }, "window:opacity": { "type": "number" },