diff --git a/.github/workflows/release-tauri.yml b/.github/workflows/release-tauri.yml index 875ccd97..043da8d3 100644 --- a/.github/workflows/release-tauri.yml +++ b/.github/workflows/release-tauri.yml @@ -379,6 +379,11 @@ jobs: OPENLESS_UPDATE_MIRROR_BASE_URL: https://fastgit.cc/https://github.com # beta 渠道时输出 latest-{tgt}-{arch}-beta.json,stable 沿用旧文件名。 OPENLESS_RELEASE_CHANNEL: ${{ env.OPENLESS_RELEASE_CHANNEL }} + # Beta 渠道里脚本要把 manifest.url 写成 releases/download//... + # 而不是 releases/latest(后者永远 = Stable,Beta 用户按 url 下载会拉到错文件)。 + # workflow_dispatch 时 github.ref_name 不是 tag——但那种情况下 channel=stable, + # 脚本不会读这个字段,安全。 + OPENLESS_RELEASE_TAG: ${{ github.ref_name }} run: node scripts/write-updater-manifest.mjs # ── 收集产物 ── diff --git a/openless-all/app/scripts/write-updater-manifest.mjs b/openless-all/app/scripts/write-updater-manifest.mjs index 171cd35a..0803fbb1 100755 --- a/openless-all/app/scripts/write-updater-manifest.mjs +++ b/openless-all/app/scripts/write-updater-manifest.mjs @@ -15,6 +15,14 @@ if (rawChannel !== 'stable' && rawChannel !== 'beta') { throw new Error(`Invalid OPENLESS_RELEASE_CHANNEL: "${rawChannel}" (expected "stable" or "beta")`); } const channelSuffix = rawChannel === 'beta' ? '-beta' : ''; +// Beta 渠道里 manifest.url 必须指向具体 tag 路径,不能用 releases/latest——后者 +// 永远是最新非-prerelease(即 Stable),Beta 用户按 url 下载会拉到 Stable 包, +// 文件名碰巧重名时下载错版本,文件名带版本号时直接 404。 +// Stable 渠道沿用 releases/latest,没问题。 +const releaseTag = process.env.OPENLESS_RELEASE_TAG || ''; +if (rawChannel === 'beta' && !releaseTag) { + throw new Error('OPENLESS_RELEASE_TAG is required when OPENLESS_RELEASE_CHANNEL=beta'); +} if (!target || !arch) { throw new Error('OPENLESS_UPDATE_TARGET and OPENLESS_UPDATE_ARCH are required'); @@ -64,8 +72,13 @@ if (!existsSync(signaturePath)) { const assetName = basename(artifact); const manifestName = `latest-${target}-${arch}${channelSuffix}.json`; const mirrorManifestName = `latest-${target}-${arch}${channelSuffix}-mirror.json`; -const githubAssetUrl = `https://github.com/${repo}/releases/latest/download/${assetName}`; -const mirrorAssetUrl = `${mirrorBaseUrl.replace(/\/$/, '')}/${repo}/releases/latest/download/${assetName}`; +// Stable: releases/latest/download/(GitHub 自动重定向到最新非-prerelease) +// Beta: releases/download//(指定具体 tag,不被 prerelease 折叠影响) +const downloadPath = rawChannel === 'beta' + ? `releases/download/${releaseTag}/${assetName}` + : `releases/latest/download/${assetName}`; +const githubAssetUrl = `https://github.com/${repo}/${downloadPath}`; +const mirrorAssetUrl = `${mirrorBaseUrl.replace(/\/$/, '')}/${repo}/${downloadPath}`; const manifest = { version: packageJson.version, pub_date: new Date().toISOString(),