You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maka.apache.org by as...@apache.org on 2026/08/30 15:18:29 UTC
(maka) branch main updated: fix: pin Desktop Nightly feed channel (#4266)
This is an automated email from the ASF dual-hosted git repository.
Astro-Han pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/maka.git
The following commit(s) were added to refs/heads/main by this push:
new b832348880 fix: pin Desktop Nightly feed channel (#4266)
b832348880 is described below
commit b83234888016d5f8ccac2a4f114f24ac22ee5fbf
Author: AstroHan <le...@outlook.com>
AuthorDate: Sun Aug 30 23:18:22 2026 +0800
fix: pin Desktop Nightly feed channel (#4266)
Prevent prerelease version inference from renaming the update metadata away from latest-mac.yml and latest.yml.
Generated-by: Codex
---
apps/desktop/electron-builder.config.mjs | 2 +-
scripts/desktop-nightly.test.mjs | 31 +++++++++++++++++++++++++------
scripts/desktop-update-contract.mjs | 1 +
3 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/apps/desktop/electron-builder.config.mjs b/apps/desktop/electron-builder.config.mjs
index f50786a29d..42ac6f2ebf 100644
--- a/apps/desktop/electron-builder.config.mjs
+++ b/apps/desktop/electron-builder.config.mjs
@@ -287,7 +287,7 @@ export function resolveDesktopBuilderConfig(environment = process.env) {
runtimeHostSetupPackage: resolveRuntimeHostSetupPackage(rootManifest.version, environment),
makaUpdateChannel: 'nightly',
},
- publish: [{ provider: 'generic', url: DESKTOP_NIGHTLY_FEED_URL }],
+ publish: [{ provider: 'generic', url: DESKTOP_NIGHTLY_FEED_URL, channel: 'latest' }],
};
}
diff --git a/scripts/desktop-nightly.test.mjs b/scripts/desktop-nightly.test.mjs
index 2446914b9d..52f437fbfc 100644
--- a/scripts/desktop-nightly.test.mjs
+++ b/scripts/desktop-nightly.test.mjs
@@ -25,6 +25,7 @@ import { test } from 'node:test';
import { fileURLToPath } from 'node:url';
import { resolveDesktopBuilderConfig } from '../apps/desktop/electron-builder.config.mjs';
import { resolveDesktopBuildVersion, resolveRuntimeHostSetupPackage } from './desktop-nightly.mjs';
+import { assertPackagedUpdateConfiguration } from './desktop-update-contract.mjs';
const run = promisify(execFile);
const repoRoot = dirname(dirname(fileURLToPath(import.meta.url)));
@@ -38,12 +39,30 @@ test('a nightly package embeds only the Apache Nightlies update authority', () =
assert.equal(config.extraMetadata.version, version);
assert.equal(config.extraMetadata.runtimeHostSetupPackage, `maka-agent@${version}`);
assert.equal(config.extraMetadata.makaUpdateChannel, 'nightly');
- assert.deepEqual(config.publish, [
- {
- provider: 'generic',
- url: 'https://nightlies.apache.org/maka/desktop/',
- },
- ]);
+ assert.equal(config.publish.length, 1);
+ assert.equal(config.publish[0].provider, 'generic');
+ assert.equal(config.publish[0].url, 'https://nightlies.apache.org/maka/desktop/');
+});
+
+test('a dev Nightly identity still advances the latest Desktop feed', () => {
+ const config = resolveDesktopBuilderConfig({
+ MAKA_DESKTOP_NIGHTLY_VERSION: '0.2.0-dev.42.20260829',
+ });
+
+ assert.equal(config.publish[0].channel, 'latest');
+});
+
+test('a packaged Nightly accepts the pinned latest update channel', async () => {
+ const packagedConfiguration = `provider: generic
+url: https://nightlies.apache.org/maka/desktop/
+channel: latest
+updaterCacheDirName: '@makadesktop-updater'
+`;
+
+ await assertPackagedUpdateConfiguration('/fixture', {
+ channel: 'nightly',
+ read: async () => packagedConfiguration,
+ });
});
test('formal release checks ignore the ambient Nightly packaging environment', async () => {
diff --git a/scripts/desktop-update-contract.mjs b/scripts/desktop-update-contract.mjs
index 6d2279815f..13c64c2e95 100644
--- a/scripts/desktop-update-contract.mjs
+++ b/scripts/desktop-update-contract.mjs
@@ -33,6 +33,7 @@ export const DESKTOP_UPDATE_PROVIDER = Object.freeze({
export const DESKTOP_NIGHTLY_UPDATE_PROVIDER = Object.freeze({
provider: 'generic',
url: 'https://nightlies.apache.org/maka/desktop/',
+ channel: 'latest',
updaterCacheDirName: '@makadesktop-updater',
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org