From 295f7e42911491e29edb61b2abb3f50f013295c0 Mon Sep 17 00:00:00 2001 From: DIYgod Date: Fri, 29 May 2026 15:46:38 +0800 Subject: [PATCH] fix(release): skip opposite platform push builds --- .../scripts/release-workflow-guards.test.ts | 25 +++++++++++++++++++ .github/workflows/build-android.yml | 11 ++++++-- .github/workflows/build-desktop.yml | 10 +++++++- .github/workflows/build-ios.yml | 10 +++++++- 4 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 .github/scripts/release-workflow-guards.test.ts diff --git a/.github/scripts/release-workflow-guards.test.ts b/.github/scripts/release-workflow-guards.test.ts new file mode 100644 index 000000000..23a02b0a9 --- /dev/null +++ b/.github/scripts/release-workflow-guards.test.ts @@ -0,0 +1,25 @@ +import { readFileSync } from "node:fs" + +import { describe, expect, it } from "vitest" + +const workflow = (name: string) => readFileSync(`.github/workflows/${name}`, "utf8") + +describe("release build workflow guards", () => { + it("skips direct mobile push builds for desktop release commits on main", () => { + const androidWorkflow = workflow("build-android.yml") + const iosWorkflow = workflow("build-ios.yml") + + expect(androidWorkflow).toContain("github.ref == 'refs/heads/main'") + expect(androidWorkflow).toContain("release(desktop):") + + expect(iosWorkflow).toContain("github.ref == 'refs/heads/main'") + expect(iosWorkflow).toContain("release(desktop):") + }) + + it("skips direct desktop push builds for mobile release commits on mobile-main", () => { + const desktopWorkflow = workflow("build-desktop.yml") + + expect(desktopWorkflow).toContain("github.ref == 'refs/heads/mobile-main'") + expect(desktopWorkflow).toContain("release(mobile):") + }) +}) diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 1919001fc..f75778135 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -29,9 +29,16 @@ concurrency: jobs: build: name: Build Android apk for device - if: github.secret_source != 'None' && (github.event_name != 'push' || github.ref != 'refs/heads/mobile-main' || !contains(github.event.head_commit.message || '', 'release(mobile):')) + if: >- + github.secret_source != 'None' && + ( + github.event_name != 'push' || + !( + (github.ref == 'refs/heads/mobile-main' && contains(github.event.head_commit.message || '', 'release(mobile):')) || + (github.ref == 'refs/heads/main' && contains(github.event.head_commit.message || '', 'release(desktop):')) + ) + ) runs-on: ubuntu-latest - steps: - name: 🧹 Claim disk space run: | diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index 1f9f633cf..57a936113 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -39,7 +39,15 @@ env: jobs: release: - if: github.secret_source != 'None' && (github.event_name != 'push' || github.ref != 'refs/heads/main' || !contains(github.event.head_commit.message || '', 'release(desktop):')) + if: >- + github.secret_source != 'None' && + ( + github.event_name != 'push' || + !( + (github.ref == 'refs/heads/main' && contains(github.event.head_commit.message || '', 'release(desktop):')) || + (github.ref == 'refs/heads/mobile-main' && contains(github.event.head_commit.message || '', 'release(mobile):')) + ) + ) runs-on: ${{ matrix.os }} env: PROD: ${{ github.event.inputs.tag_version == 'true' || github.ref_type == 'tag' || github.event.inputs.store == 'true' }} diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 6eaa7e7c0..85ad6f586 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -23,7 +23,15 @@ concurrency: jobs: check-runner: - if: github.secret_source != 'None' && (github.event_name != 'push' || github.ref != 'refs/heads/mobile-main' || !contains(github.event.head_commit.message || '', 'release(mobile):')) + if: >- + github.secret_source != 'None' && + ( + github.event_name != 'push' || + !( + (github.ref == 'refs/heads/mobile-main' && contains(github.event.head_commit.message || '', 'release(mobile):')) || + (github.ref == 'refs/heads/main' && contains(github.event.head_commit.message || '', 'release(desktop):')) + ) + ) runs-on: ubuntu-latest outputs: runner-label: ${{ steps.set-runner.outputs.runner-label }}