From b0d69a410782288275d44de23fecb40fa917c9ea Mon Sep 17 00:00:00 2001 From: liukewia Date: Fri, 28 Aug 2026 16:40:11 +0800 Subject: [PATCH 1/3] chore: update octop-desktop workflow to limit PR builds and refine platform selection - Adjusted the GitHub Actions workflow to trigger builds for pull requests affecting the `desktop/` directory, limiting them to `darwin-arm64` and `darwin-amd64` platforms only. - Enhanced platform selection logic to differentiate between pull request and tag dispatch events, ensuring appropriate builds are executed based on the event type. - Updated README to reflect changes in CI behavior and clarify build processes for different scenarios. --- .github/workflows/octop-desktop.yml | 15 +++++++++++++-- desktop/README.md | 7 ++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/octop-desktop.yml b/.github/workflows/octop-desktop.yml index 4a453911..089ae520 100644 --- a/.github/workflows/octop-desktop.yml +++ b/.github/workflows/octop-desktop.yml @@ -4,11 +4,16 @@ name: Octop Desktop Package # 打的 tag 不会触发 push workflow）。产物由本 workflow 的 release job upsert 到同一 # GitHub Release。workflow_dispatch 保留给手工补包 / 按平台重跑。 # 不要对任意分支 push 跑六平台矩阵。 +# pull_request（desktop/**）只打 darwin-*，避免 PR 上跑满六平台。 on: push: tags: - "v*" + pull_request: + paths: + - "desktop/**" + - ".github/workflows/octop-desktop.yml" workflow_dispatch: inputs: platforms: @@ -72,6 +77,8 @@ jobs: package: name: "${{ matrix.plat }}" needs: frontend + # PRs only start the two macOS runners; linux/windows stay in the matrix for tags/dispatch. + if: github.event_name != 'pull_request' || startsWith(matrix.plat, 'darwin-') runs-on: ${{ matrix.os }} # Matrix runners are native for each plat; pin host detection so x64 Git Bash # on windows-11-arm does not mis-classify the job as windows-amd64 cross-build. @@ -109,8 +116,12 @@ jobs: id: want run: | set -euo pipefail - sel="${{ github.event.inputs.platforms || 'all' }}" - sel="$(echo "$sel" | tr '[:upper:]' '[:lower:]' | tr -d ' ')" + if [[ "${{ github.event_name }}" == "pull_request" ]]; then + sel="darwin-arm64,darwin-amd64" + else + sel="${{ github.event.inputs.platforms || 'all' }}" + sel="$(echo "$sel" | tr '[:upper:]' '[:lower:]' | tr -d ' ')" + fi plat="${{ matrix.plat }}" if [[ "$sel" == "all" || ",$sel," == *",$plat,"* ]]; then echo "build=true" >> "$GITHUB_OUTPUT" diff --git a/desktop/README.md b/desktop/README.md index b8f2873f..2b14d71b 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -25,9 +25,10 @@ From repo root: make -f desktop/portable/Makefile green ``` -CI: `.github/workflows/octop-portable.yml` builds all six native platform/arch -variants. Each job first creates the green zip and then packages the matching -Wails application. +CI: `.github/workflows/octop-desktop.yml` builds native platform/arch variants. +`v*` tags and `workflow_dispatch` (platforms=`all`) run all six; pull requests +that touch `desktop/` build `darwin-arm64` / `darwin-amd64` only. Each job +first creates the green zip and then packages the matching Wails application. ## Build a complete desktop release From 08857d8a7e08c4ed569e9444f567cf0251248369 Mon Sep 17 00:00:00 2001 From: liukewia Date: Fri, 28 Aug 2026 16:44:24 +0800 Subject: [PATCH 2/3] chore: enhance octop-desktop workflow with dynamic platform selection - Introduced a new job to dynamically select platforms based on the event type, allowing for more flexible builds. - Updated the matrix configuration to utilize the output from the platform selection step, streamlining the build process. - Removed redundant build decision steps, simplifying the workflow and improving clarity. --- .github/workflows/octop-desktop.yml | 104 ++++++++++++++-------------- 1 file changed, 51 insertions(+), 53 deletions(-) diff --git a/.github/workflows/octop-desktop.yml b/.github/workflows/octop-desktop.yml index 089ae520..32c2daa4 100644 --- a/.github/workflows/octop-desktop.yml +++ b/.github/workflows/octop-desktop.yml @@ -74,11 +74,57 @@ jobs: if-no-files-found: error retention-days: 7 + # Job-level `if` cannot read `matrix.*` (GitHub 422). Filter here so only + # selected runners start — PRs → darwin-*; dispatch honors `platforms`. + select-platforms: + name: Select platforms + if: github.event_name != 'workflow_dispatch' || github.event.inputs.attach_from_run == '' + runs-on: ubuntu-latest + outputs: + matrix: ${{ steps.set.outputs.matrix }} + steps: + - id: set + env: + EVENT_NAME: ${{ github.event_name }} + PLATFORMS: ${{ github.event.inputs.platforms || 'all' }} + run: | + set -euo pipefail + python3 <<'PY' + import json + import os + + all_plats = [ + {"plat": "linux-amd64", "arch": "amd64", "os": "ubuntu-latest"}, + {"plat": "linux-arm64", "arch": "arm64", "os": "ubuntu-24.04-arm"}, + {"plat": "darwin-arm64", "arch": "arm64", "os": "macos-14"}, + {"plat": "darwin-amd64", "arch": "amd64", "os": "macos-15-intel"}, + {"plat": "windows-amd64", "arch": "amd64", "os": "windows-latest"}, + {"plat": "windows-arm64", "arch": "arm64", "os": "windows-11-arm"}, + ] + if os.environ["EVENT_NAME"] == "pull_request": + sel = "darwin-arm64,darwin-amd64" + else: + sel = os.environ.get("PLATFORMS", "all").lower().replace(" ", "") + known = {row["plat"] for row in all_plats} + if sel == "all": + include = all_plats + else: + wanted = {part for part in sel.split(",") if part} + unknown = wanted - known + if unknown: + raise SystemExit(f"unknown platform(s): {', '.join(sorted(unknown))}") + include = [row for row in all_plats if row["plat"] in wanted] + if not include: + raise SystemExit(f"no platforms selected: {sel}") + matrix = json.dumps({"include": include}, separators=(",", ":")) + with open(os.environ["GITHUB_OUTPUT"], "a", encoding="utf-8") as fh: + fh.write(f"matrix={matrix}\n") + print(matrix) + PY + package: name: "${{ matrix.plat }}" - needs: frontend - # PRs only start the two macOS runners; linux/windows stay in the matrix for tags/dispatch. - if: github.event_name != 'pull_request' || startsWith(matrix.plat, 'darwin-') + needs: [frontend, select-platforms] runs-on: ${{ matrix.os }} # Matrix runners are native for each plat; pin host detection so x64 Git Bash # on windows-11-arm does not mis-classify the job as windows-amd64 cross-build. @@ -86,65 +132,25 @@ jobs: GREEN_HOST_PLAT: ${{ matrix.plat }} strategy: fail-fast: false - matrix: - include: - - plat: linux-amd64 - arch: amd64 - os: ubuntu-latest - - plat: linux-arm64 - arch: arm64 - os: ubuntu-24.04-arm - - plat: darwin-arm64 - arch: arm64 - os: macos-14 - - plat: darwin-amd64 - arch: amd64 - os: macos-15-intel - - plat: windows-amd64 - arch: amd64 - os: windows-latest - - plat: windows-arm64 - arch: arm64 - os: windows-11-arm + matrix: ${{ fromJSON(needs.select-platforms.outputs.matrix) }} defaults: run: shell: bash steps: - uses: actions/checkout@v5 - - name: Decide whether to build this platform - id: want - run: | - set -euo pipefail - if [[ "${{ github.event_name }}" == "pull_request" ]]; then - sel="darwin-arm64,darwin-amd64" - else - sel="${{ github.event.inputs.platforms || 'all' }}" - sel="$(echo "$sel" | tr '[:upper:]' '[:lower:]' | tr -d ' ')" - fi - plat="${{ matrix.plat }}" - if [[ "$sel" == "all" || ",$sel," == *",$plat,"* ]]; then - echo "build=true" >> "$GITHUB_OUTPUT" - else - echo "build=false" >> "$GITHUB_OUTPUT" - echo "Skipping ${plat} (selection=${sel})" - fi - - uses: actions/download-artifact@v5 - if: steps.want.outputs.build == 'true' with: name: dashboard-dist path: src/octop/dashboard - uses: astral-sh/setup-uv@v6 - if: steps.want.outputs.build == 'true' with: enable-cache: true python-version: "3.12" # GitHub Cache outages must not fail the build — PBS download is cheap enough. - name: Cache python-build-standalone downloads - if: steps.want.outputs.build == 'true' continue-on-error: true uses: actions/cache@v5 with: @@ -152,13 +158,11 @@ jobs: key: pbs-${{ env.PBS_TAG }}-${{ env.PBS_PY }}-${{ matrix.plat }} - name: Bootstrap portable CPython - if: steps.want.outputs.build == 'true' env: GREEN_HOST_PLAT: ${{ matrix.plat }} run: bash desktop/portable/bootstrap-runtime.sh "${{ matrix.plat }}" - name: Assemble green zip - if: steps.want.outputs.build == 'true' env: GREEN_HOST_PLAT: ${{ matrix.plat }} run: | @@ -167,7 +171,6 @@ jobs: bash desktop/portable/package.sh "${{ matrix.plat }}" - name: Smoke import (native host only) - if: steps.want.outputs.build == 'true' run: | set -euo pipefail staging="desktop/portable/release/Octop-${{ matrix.plat }}" @@ -203,23 +206,20 @@ jobs: fi - uses: actions/setup-go@v6 - if: steps.want.outputs.build == 'true' with: go-version: "1.25.x" cache-dependency-path: desktop/src/go.sum - name: Install Linux desktop build dependencies - if: steps.want.outputs.build == 'true' && runner.os == 'Linux' + if: runner.os == 'Linux' run: | sudo apt-get update sudo apt-get install -y libgtk-4-dev libwebkitgtk-6.0-dev - name: Install Wails v3 CLI - if: steps.want.outputs.build == 'true' run: go install github.com/wailsapp/wails/v3/cmd/wails3@v3.0.0-beta.13 - name: Package desktop app with bundled portable runtime - if: steps.want.outputs.build == 'true' working-directory: desktop/src run: >- wails3 task package @@ -231,7 +231,6 @@ jobs: # (Octop-.zip containing another Octop-.zip). Affects every plat. # With archive:false, artifact name is the filename (name: is ignored). - uses: actions/upload-artifact@v7 - if: steps.want.outputs.build == 'true' with: path: desktop/portable/release/Octop-${{ matrix.plat }}.zip archive: false @@ -239,7 +238,6 @@ jobs: retention-days: 14 - name: Upload bundled desktop package - if: steps.want.outputs.build == 'true' uses: actions/upload-artifact@v7 with: path: desktop/src/bin/Octop-Desktop-${{ matrix.plat }}.* From 59c5d83dd210845178bc46ff1ae9faaafdb948b9 Mon Sep 17 00:00:00 2001 From: liukewia Date: Fri, 28 Aug 2026 17:07:52 +0800 Subject: [PATCH 3/3] ci: build darwin and windows on desktop PRs PR packaging should cover all macOS and Windows arches; keep Linux for tags/dispatch only. Co-authored-by: Cursor --- .github/workflows/octop-desktop.yml | 6 +++--- desktop/README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/octop-desktop.yml b/.github/workflows/octop-desktop.yml index 32c2daa4..df079568 100644 --- a/.github/workflows/octop-desktop.yml +++ b/.github/workflows/octop-desktop.yml @@ -4,7 +4,7 @@ name: Octop Desktop Package # 打的 tag 不会触发 push workflow）。产物由本 workflow 的 release job upsert 到同一 # GitHub Release。workflow_dispatch 保留给手工补包 / 按平台重跑。 # 不要对任意分支 push 跑六平台矩阵。 -# pull_request（desktop/**）只打 darwin-*，避免 PR 上跑满六平台。 +# pull_request（desktop/**）打 darwin-* + windows-*，不跑 linux。 on: push: @@ -75,7 +75,7 @@ jobs: retention-days: 7 # Job-level `if` cannot read `matrix.*` (GitHub 422). Filter here so only - # selected runners start — PRs → darwin-*; dispatch honors `platforms`. + # selected runners start — PRs → darwin-* + windows-*; dispatch honors `platforms`. select-platforms: name: Select platforms if: github.event_name != 'workflow_dispatch' || github.event.inputs.attach_from_run == '' @@ -102,7 +102,7 @@ jobs: {"plat": "windows-arm64", "arch": "arm64", "os": "windows-11-arm"}, ] if os.environ["EVENT_NAME"] == "pull_request": - sel = "darwin-arm64,darwin-amd64" + sel = "darwin-arm64,darwin-amd64,windows-amd64,windows-arm64" else: sel = os.environ.get("PLATFORMS", "all").lower().replace(" ", "") known = {row["plat"] for row in all_plats} diff --git a/desktop/README.md b/desktop/README.md index 2b14d71b..3775409e 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -27,7 +27,7 @@ make -f desktop/portable/Makefile green CI: `.github/workflows/octop-desktop.yml` builds native platform/arch variants. `v*` tags and `workflow_dispatch` (platforms=`all`) run all six; pull requests -that touch `desktop/` build `darwin-arm64` / `darwin-amd64` only. Each job +that touch `desktop/` build `darwin-*` and `windows-*` (amd64 + arm64). Each job first creates the green zip and then packages the matching Wails application. ## Build a complete desktop release