From 6c6d9636bb74ab4b28c645adeb021eb1644a82d5 Mon Sep 17 00:00:00 2001 From: wangjia <809946525@qq.com> Date: Tue, 8 Sep 2026 06:59:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(ci):=20=E4=B8=B2=E8=A1=8C=E5=8C=96=20mac=20?= =?UTF-8?q?=E4=B8=89=20job(android=E2=86=92macos=E2=86=92ios)=20=E6=B6=88?= =?UTF-8?q?=E9=99=A4=E5=8D=95=20runner=20=E4=BA=89=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit run#286 暴露:三个 runs-on:mac 并行,家里只一个 mac runner(capacity=1), android 占住后 macos/ios 抢不到 runner 被整体 cancelled(全步骤含 Checkout 都 cancelled)→ iOS 没跑起来、没上 TestFlight。用 needs 把 mac 三 job 串成 链(build-macos needs android、build-ios needs macos)+ if:!cancelled() 保证 上游失败也照跑,一个跑完再跑下一个,不再争用。windows/deploy-web 在各自 runner 上仍并行。对齐 jiu 的 needs 链。 Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01FEVUXAbFT6bF1Qw27RHWoD --- .gitea/workflows/deploy-client.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitea/workflows/deploy-client.yml b/.gitea/workflows/deploy-client.yml index 106e6fb..641d9b1 100644 --- a/.gitea/workflows/deploy-client.yml +++ b/.gitea/workflows/deploy-client.yml @@ -96,6 +96,13 @@ jobs: # APPSTORE_API_* 等),macos/ios 正常应成功;continue-on-error 只是抖动兜底。 build-macos: runs-on: mac + # 串行化 mac 三 job(android→macos→ios):家里只有一个 mac runner(capacity=1), + # 三个 runs-on:mac 并行会抢同一 runner → 抢不到的被取消(run#286 的 macos/ios 全步 + # 骤 cancelled 即此)。用 needs 串成链让它们一个跑完再跑下一个;`if: !cancelled()` + # 保证即便上游(android/macos)失败,本 job 仍在其完成后照跑(不因上游 fail 被 skip), + # 与 continue-on-error 一起兜住「单平台抖动不拖累其他平台」。对齐 jiu 的 needs 链。 + needs: [build-android] + if: ${{ !cancelled() }} continue-on-error: true env: GOPROXY: https://goproxy.cn,direct @@ -138,6 +145,9 @@ jobs: build-ios: runs-on: mac + # 串行链末环:等 build-macos 完成再跑(单 mac runner 不争用,见 build-macos 注释)。 + needs: [build-macos] + if: ${{ !cancelled() }} continue-on-error: true env: GOPROXY: https://goproxy.cn,direct