tor-browser

commit 6ad23f4b90f5762691cd8fcdee3a197906b502fe
parent 2c019453bd4ccb2b54e9e1097919e773f16d9c04
Author: Pier Angelo Vendrame <pierov@torproject.org>
Date:   Wed, 30 Aug 2023 14:43:21 +0200

BB 42061: Create an alpha update channel.

Diffstat:
M
browser/base/content/aboutDialog-appUpdater.js
 | 
2
+-
M
browser/base/content/aboutDialog.js
 | 
6
------
M
browser/components/preferences/main.js
 | 
10
++--------
M
devtools/client/aboutdebugging/src/actions/runtimes.js
 | 
5
+++++
M
toolkit/mozapps/extensions/test/browser/head.js
 | 
1
+
M
toolkit/mozapps/update/updater/moz.build
 | 
2
+-

6 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/browser/base/content/aboutDialog-appUpdater.js b/browser/base/content/aboutDialog-appUpdater.js
@@ -205,7 +205,7 @@ appUpdater.prototype = {
       if (aChildID == "downloadAndInstall") {
         let updateVersion = gAppUpdater.update.displayVersion;
         // Include the build ID if this is an "a#" (nightly or aurora) build
-        if (/a\d+$/.test(updateVersion)) {
+        if (!AppConstants.BASE_BROWSER_UPDATE && /a\d+$/.test(updateVersion)) {
           let buildID = gAppUpdater.update.buildID;
           let year = buildID.slice(0, 4);
           let month = buildID.slice(4, 6);
diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js
@@ -59,12 +59,6 @@ function init() {
 
   let version = Services.appinfo.version;
   if (/a\d+$/.test(version)) {
-    let buildID = Services.appinfo.appBuildID;
-    let year = buildID.slice(0, 4);
-    let month = buildID.slice(4, 6);
-    let day = buildID.slice(6, 8);
-    versionAttributes.isodate = `${year}-${month}-${day}`;
-
     document.getElementById("experimental").hidden = false;
     document.getElementById("communityDesc").hidden = true;
   }
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
@@ -4672,14 +4672,8 @@ var gMainPane = {
     // Initialize the Firefox Updates section.
     let version = AppConstants.BASE_BROWSER_VERSION;
 
-    // Include the build ID if this is an "a#" (nightly) build
-    if (/a\d+$/.test(version)) {
-      let buildID = Services.appinfo.appBuildID;
-      let year = buildID.slice(0, 4);
-      let month = buildID.slice(4, 6);
-      let day = buildID.slice(6, 8);
-      version += ` (${year}-${month}-${day})`;
-    }
+    // Base Browser and derivatives: do not include the build ID in our alphas,
+    // since they are not actually related to the build date.
 
     // Append "(32-bit)" or "(64-bit)" build architecture to the version number:
     let bundle = Services.strings.createBundle(
diff --git a/devtools/client/aboutdebugging/src/actions/runtimes.js b/devtools/client/aboutdebugging/src/actions/runtimes.js
@@ -71,6 +71,11 @@ async function getRuntimeIcon(runtime, channel) {
     }
   }
 
+  // Use the release build skin for devtools within Tor Browser alpha releases.
+  if (channel === "alpha") {
+    return "chrome://devtools/skin/images/aboutdebugging-firefox-release.svg";
+  }
+
   return channel === "release" || channel === "beta" || channel === "aurora"
     ? `chrome://devtools/skin/images/aboutdebugging-firefox-${channel}.svg`
     : "chrome://devtools/skin/images/aboutdebugging-firefox-nightly.svg";
diff --git a/toolkit/mozapps/extensions/test/browser/head.js b/toolkit/mozapps/extensions/test/browser/head.js
@@ -39,6 +39,7 @@ var PREF_CHECK_COMPATIBILITY;
   var channel = Services.prefs.getCharPref("app.update.channel", "default");
   if (
     channel != "aurora" &&
+    channel != "alpha" &&
     channel != "beta" &&
     channel != "release" &&
     channel != "esr"
diff --git a/toolkit/mozapps/update/updater/moz.build b/toolkit/mozapps/update/updater/moz.build
@@ -53,7 +53,7 @@ xpcshell_cert.script = "gen_cert_header.py:create_header"
 dep1_cert.script = "gen_cert_header.py:create_header"
 dep2_cert.script = "gen_cert_header.py:create_header"
 
-if CONFIG["MOZ_UPDATE_CHANNEL"] in ("beta", "release", "esr"):
+if CONFIG["MOZ_UPDATE_CHANNEL"] in ("alpha", "beta", "release", "esr"):
     primary_cert.inputs += ["release_primary.der"]
     secondary_cert.inputs += ["release_secondary.der"]
 elif CONFIG["MOZ_UPDATE_CHANNEL"] in (