From 714dc351b91d22f35d8cd19f26fa48a21a9ae304 Mon Sep 17 00:00:00 2001 From: Eva Date: Thu, 2 Jul 2026 16:20:55 +0700 Subject: [PATCH 1/3] ci: pass pinned bridge ref to manual Workbench builds --- .github/workflows/_build-reusable.yml | 12 ++++++++++++ .github/workflows/build-manual.yml | 15 +++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/.github/workflows/_build-reusable.yml b/.github/workflows/_build-reusable.yml index c109016edca..42b1da550d2 100644 --- a/.github/workflows/_build-reusable.yml +++ b/.github/workflows/_build-reusable.yml @@ -23,6 +23,14 @@ on: description: 'Only upload primary installers (exe/msi/dmg/deb), skip zip/yml/blockmap' type: boolean default: false + aioncore_run_id: + description: 'Optional AionCore Manual Build workflow run id to bundle instead of the pinned release' + type: string + default: '' + managed_resources_bundle: + description: 'AionCore managed resources bundle mode: full or no-acp' + type: string + default: full env: BUN_INSTALL_REGISTRY: 'https://registry.npmjs.org/' @@ -311,6 +319,8 @@ jobs: # Version is pinned in repo-root package.json (aioncoreVersion). # Set AIONUI_BACKEND_VERSION here only to override for ad-hoc builds. AIONUI_BACKEND_ARCH: ${{ matrix.arch }} + AIONUI_BACKEND_RUN_ID: ${{ inputs.aioncore_run_id }} + AIONUI_MANAGED_RESOURCES_BUNDLE: ${{ inputs.managed_resources_bundle }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -450,6 +460,8 @@ jobs: CSC_NAME: ${{ secrets.IDENTITY }} CSC_IDENTITY_AUTO_DISCOVERY: false EVAOS_DESKTOP_BRIDGE_REQUIRE_REAL: 'true' + EVAOS_DESKTOP_BRIDGE_SOURCE_REF: ${{ vars.EVAOS_DESKTOP_BRIDGE_SOURCE_REF }} + EVAOS_DESKTOP_BRIDGE_SOURCE_TOKEN: ${{ secrets.EVAOS_DESKTOP_BRIDGE_SOURCE_TOKEN || secrets.GH_TOKEN || github.token }} npm_config_cache: ${{ runner.temp }}/.npm ELECTRON_CACHE: ${{ runner.temp }}/.cache/electron ELECTRON_BUILDER_CACHE: ${{ runner.temp }}/.cache/electron-builder diff --git a/.github/workflows/build-manual.yml b/.github/workflows/build-manual.yml index 88c5817f21b..bb68efe49cb 100644 --- a/.github/workflows/build-manual.yml +++ b/.github/workflows/build-manual.yml @@ -30,6 +30,19 @@ on: required: false type: boolean default: false + aioncore_run_id: + description: 'Optional AionCore Manual Build workflow run id to bundle instead of the pinned release' + required: false + type: string + default: '' + managed_resources_bundle: + description: 'AionCore managed resources bundle mode' + required: false + type: choice + options: + - no-acp + - full + default: 'no-acp' env: BUN_INSTALL_REGISTRY: 'https://registry.npmjs.org/' @@ -82,6 +95,8 @@ jobs: matrix: ${{ needs.prepare-matrix.outputs.matrix }} ref: ${{ inputs.branch }} skip_code_quality: ${{ inputs.skip_code_quality }} + aioncore_run_id: ${{ inputs.aioncore_run_id }} + managed_resources_bundle: ${{ inputs.managed_resources_bundle }} append_commit_hash: true upload_installers_only: true secrets: inherit From 72125ec26c3a39e6daef5564ee44c7b9a6a816f3 Mon Sep 17 00:00:00 2001 From: Eva Date: Thu, 2 Jul 2026 16:33:23 +0700 Subject: [PATCH 2/3] ci: serialize manual Workbench builds --- .github/workflows/build-manual.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-manual.yml b/.github/workflows/build-manual.yml index bb68efe49cb..a8ae63d84ae 100644 --- a/.github/workflows/build-manual.yml +++ b/.github/workflows/build-manual.yml @@ -44,6 +44,10 @@ on: - full default: 'no-acp' +concurrency: + group: ${{ github.workflow }}-${{ github.event.inputs.branch || github.ref }}-${{ github.event.inputs.platform || 'all' }} + cancel-in-progress: false + env: BUN_INSTALL_REGISTRY: 'https://registry.npmjs.org/' From 7fb0a0ab089d345818a28cad2c2779ee6628a83b Mon Sep 17 00:00:00 2001 From: Eva Date: Thu, 2 Jul 2026 16:36:49 +0700 Subject: [PATCH 3/3] ci: keep manual build inputs executable --- .github/workflows/_build-reusable.yml | 8 +++----- .github/workflows/build-manual.yml | 6 ------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/_build-reusable.yml b/.github/workflows/_build-reusable.yml index 42b1da550d2..a9023ede7bd 100644 --- a/.github/workflows/_build-reusable.yml +++ b/.github/workflows/_build-reusable.yml @@ -23,10 +23,6 @@ on: description: 'Only upload primary installers (exe/msi/dmg/deb), skip zip/yml/blockmap' type: boolean default: false - aioncore_run_id: - description: 'Optional AionCore Manual Build workflow run id to bundle instead of the pinned release' - type: string - default: '' managed_resources_bundle: description: 'AionCore managed resources bundle mode: full or no-acp' type: string @@ -319,7 +315,6 @@ jobs: # Version is pinned in repo-root package.json (aioncoreVersion). # Set AIONUI_BACKEND_VERSION here only to override for ad-hoc builds. AIONUI_BACKEND_ARCH: ${{ matrix.arch }} - AIONUI_BACKEND_RUN_ID: ${{ inputs.aioncore_run_id }} AIONUI_MANAGED_RESOURCES_BUNDLE: ${{ inputs.managed_resources_bundle }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -350,6 +345,7 @@ jobs: } env: WINDOWS_BUILD_COMMAND: ${{ matrix.command }} + AIONUI_MANAGED_RESOURCES_BUNDLE: ${{ inputs.managed_resources_bundle }} # Node.js memory limit for vite bundling (prevents OOM during build) # Node.js 内存限制，防止 vite 打包时内存不足 NODE_OPTIONS: '--max-old-space-size=8192' @@ -450,6 +446,7 @@ jobs: echo "notarization_status=build_failed" >> $GITHUB_OUTPUT exit 1 env: + AIONUI_MANAGED_RESOURCES_BUNDLE: ${{ inputs.managed_resources_bundle }} NODE_OPTIONS: '--max-old-space-size=8192' npm_config_arch: ${{ matrix.arch }} APP_ID: ${{ secrets.APP_ID }} @@ -489,6 +486,7 @@ jobs: retry_wait_seconds: 60 command: ${{ matrix.command }} env: + AIONUI_MANAGED_RESOURCES_BUNDLE: ${{ inputs.managed_resources_bundle }} NODE_OPTIONS: '--max-old-space-size=8192' npm_config_arch: ${{ matrix.arch }} npm_config_cache: ${{ runner.temp }}/.npm diff --git a/.github/workflows/build-manual.yml b/.github/workflows/build-manual.yml index a8ae63d84ae..83d3efeaed7 100644 --- a/.github/workflows/build-manual.yml +++ b/.github/workflows/build-manual.yml @@ -30,11 +30,6 @@ on: required: false type: boolean default: false - aioncore_run_id: - description: 'Optional AionCore Manual Build workflow run id to bundle instead of the pinned release' - required: false - type: string - default: '' managed_resources_bundle: description: 'AionCore managed resources bundle mode' required: false @@ -99,7 +94,6 @@ jobs: matrix: ${{ needs.prepare-matrix.outputs.matrix }} ref: ${{ inputs.branch }} skip_code_quality: ${{ inputs.skip_code_quality }} - aioncore_run_id: ${{ inputs.aioncore_run_id }} managed_resources_bundle: ${{ inputs.managed_resources_bundle }} append_commit_hash: true upload_installers_only: true