Skip to content
This repository was archived by the owner on Oct 13, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/_build-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/'
Expand Down Expand Up @@ -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 }}
Comment thread
100yenadmin marked this conversation as resolved.
Resolved
AIONUI_MANAGED_RESOURCES_BUNDLE: ${{ inputs.managed_resources_bundle }}
Comment thread
100yenadmin marked this conversation as resolved.
Resolved
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -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 }}

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Fall back to the pinned bridge ref

When Manual Build checks out an older/beta branch via ref: inputs.branch, the scripts/prepareEvaosDesktopBridgeResource.js that runs is from that checked-out branch, not necessarily the current one with the hard-coded pinned default. If the repo/org variable EVAOS_DESKTOP_BRIDGE_SOURCE_REF is unset, this line exports an empty value, so strict macOS builds can still fall back to that branch's mutable/default ref and fail the pinned-ref check. Add a literal approved SHA fallback here, or make the ref a required manual input, so the default-branch workflow is self-contained for older build refs.

Useful? React with 👍 / 👎.

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
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/build-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

env:
BUN_INSTALL_REGISTRY: 'https://registry.npmjs.org/'
Expand Down Expand Up @@ -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
Loading