From c1d7faa1616cd9bcbcc22f4cca358b9d2f5e269b Mon Sep 17 00:00:00 2001 From: Alexey Zinoviev Date: Mon, 18 Aug 2025 23:02:37 +0700 Subject: [PATCH] qfix: backward compatible multiple desktop updates channels (#9687) Signed-off-by: Alexey Zinoviev --- desktop/src/main/start.ts | 2 +- desktop/src/ui/types.ts | 3 ++- dev/docker-compose.min.yaml | 3 ++- dev/docker-compose.yaml | 3 ++- pods/front/src/__start.ts | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/desktop/src/main/start.ts b/desktop/src/main/start.ts index d8c4547dac..35fa9fad4e 100644 --- a/desktop/src/main/start.ts +++ b/desktop/src/main/start.ts @@ -377,7 +377,7 @@ ipcMain.on('set-combined-config', (_event: any, config: Config) => { const updatesUrl = process.env.DESKTOP_UPDATES_URL ?? config.DESKTOP_UPDATES_URL ?? 'https://dist.huly.io' // NOTE: env format is: default_value;key1:value1;key2:value2... - const updatesChannels = (process.env.DESKTOP_UPDATES_CHANNEL ?? config.DESKTOP_UPDATES_CHANNEL ?? 'huly').split(';').map(c => c.trim().split(':')) + const updatesChannels = (process.env.DESKTOP_UPDATES_CHANNEL ?? config.DESKTOP_UPDATES_CHANNELS ?? config.DESKTOP_UPDATES_CHANNEL ?? 'huly').split(';').map(c => c.trim().split(':')) const updateChannelsMap: Record = {} for (const channelInfo of updatesChannels) { if (channelInfo.length === 1) { diff --git a/desktop/src/ui/types.ts b/desktop/src/ui/types.ts index 19d6b8d569..971dae1070 100644 --- a/desktop/src/ui/types.ts +++ b/desktop/src/ui/types.ts @@ -16,7 +16,8 @@ export interface Config { COLLABORATOR?: string COLLABORATOR_URL: string CONFIG_URL: string - DESKTOP_UPDATES_CHANNEL?: string + DESKTOP_UPDATES_CHANNEL?: string // deprecated, kept for backwards compatibility of old desktop versions that will still need to be upgraded + DESKTOP_UPDATES_CHANNELS?: string DESKTOP_UPDATES_URL?: string DISABLE_SIGNUP?: string HIDE_LOCAL_LOGIN?: string diff --git a/dev/docker-compose.min.yaml b/dev/docker-compose.min.yaml index 60cd6ba635..fb5878dcb3 100644 --- a/dev/docker-compose.min.yaml +++ b/dev/docker-compose.min.yaml @@ -198,7 +198,8 @@ services: - SIGN_URL=http://huly.local:4006 # - ANALYTICS_COLLECTOR_URL=http://huly.local:4017 - DESKTOP_UPDATES_URL=https://dist.huly.io - - DESKTOP_UPDATES_CHANNEL=dev;tracex:dev-tracex + - DESKTOP_UPDATES_CHANNEL=dev + - DESKTOP_UPDATES_CHANNELS=dev;tracex:dev-tracex - BRANDING_URL=http://huly.local:8087/branding.json - STREAM_URL=http://huly.local:1080/recording # - DISABLE_SIGNUP=true diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml index 6302d304d5..0898467e1c 100644 --- a/dev/docker-compose.yaml +++ b/dev/docker-compose.yaml @@ -254,7 +254,8 @@ services: - SIGN_URL=http://huly.local:4006 # - ANALYTICS_COLLECTOR_URL=http://huly.local:4017 - DESKTOP_UPDATES_URL=https://dist.huly.io - - DESKTOP_UPDATES_CHANNEL=dev;tracex:dev-tracex + - DESKTOP_UPDATES_CHANNEL=dev + - DESKTOP_UPDATES_CHANNELS=dev;tracex:dev-tracex - BRANDING_URL=http://huly.local:8087/branding.json - STREAM_URL=http://huly.local:1080/recording - COMMUNICATION_API_ENABLED=true diff --git a/pods/front/src/__start.ts b/pods/front/src/__start.ts index 340cc76e0c..a64a52a309 100644 --- a/pods/front/src/__start.ts +++ b/pods/front/src/__start.ts @@ -43,6 +43,7 @@ startFront(metricsContext, { POSTHOG_HOST: process.env.POSTHOG_HOST, DESKTOP_UPDATES_URL: process.env.DESKTOP_UPDATES_URL, DESKTOP_UPDATES_CHANNEL: process.env.DESKTOP_UPDATES_CHANNEL, + DESKTOP_UPDATES_CHANNELS: process.env.DESKTOP_UPDATES_CHANNELS, ANALYTICS_COLLECTOR_URL: process.env.ANALYTICS_COLLECTOR_URL, LINK_PREVIEW_URL: process.env.LINK_PREVIEW_URL, AI_URL: process.env.AI_URL,