From 7a80dde30f2c54fc0eb79ffe0616d64468a9d3ff Mon Sep 17 00:00:00 2001 From: trickypr Date: Thu, 23 Jun 2022 11:56:30 +1000 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20gluon=20Gluon=20?= =?UTF-8?q?is=20now=20responsible=20for=20handling=20the=20`update-channel?= =?UTF-8?q?`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configs/common/mozconfig | 1 - gluon | 2 +- gluon.json | 42 +++++++++++++++++++++++++++++++++++----- 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/configs/common/mozconfig b/configs/common/mozconfig index f986837..6d94147 100644 --- a/configs/common/mozconfig +++ b/configs/common/mozconfig @@ -1,5 +1,4 @@ # Browser branding -ac_add_options --enable-update-channel=stable ac_add_options --with-ccache=sccache ac_add_options --without-wasm-sandboxed-libraries diff --git a/gluon b/gluon index f5bf98d..7ce1c36 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit f5bf98d03a0bcd3bf13609762b573b6c8161831c +Subproject commit 7ce1c368f6f76eb029a0fcc6194d55b32370f3ff diff --git a/gluon.json b/gluon.json index 40546d2..7aa6f0e 100644 --- a/gluon.json +++ b/gluon.json @@ -5,8 +5,7 @@ "binaryName": "pulse-browser", "version": { "product": "firefox", - "version": "101.0.1", - "displayVersion": "1.0.0" + "version": "101.0.1" }, "buildOptions": { "generateBranding": true @@ -30,19 +29,52 @@ "backgroundColor": "#2B2A33", "brandShorterName": "Pulse", "brandShortName": "Pulse Browser", - "brandFullName": "Pulse Browser" + "brandFullName": "Pulse Browser", + "release": { + "displayVersion": "1.0.0", + "github": { + "repo": "pulse-browser/browser" + }, + "x86": { + "windowsMar": "windows.mar", + "macosMar": "macosIntel.mar", + "linuxMar": "linux.mar" + } + } }, "beta": { "backgroundColor": "#2B2A33", "brandShorterName": "Pulse", "brandShortName": "Pulse Browser", - "brandFullName": "Pulse Browser Beta" + "brandFullName": "Pulse Browser Beta", + "release": { + "displayVersion": "1.0.0-b0", + "github": { + "repo": "pulse-browser/browser" + }, + "x86": { + "windowsMar": "windows.mar", + "macosMar": "macosIntel.mar", + "linuxMar": "linux.mar" + } + } }, "alpha": { "backgroundColor": "#2B2A33", "brandShorterName": "Pulse", "brandShortName": "Pulse Browser", - "brandFullName": "Pulse Browser Alpha" + "brandFullName": "Pulse Browser Alpha", + "release": { + "displayVersion": "1.0.0-a0", + "github": { + "repo": "pulse-browser/browser" + }, + "x86": { + "windowsMar": "windows.mar", + "macosMar": "macosIntel.mar", + "linuxMar": "linux.mar" + } + } } } }