Update Linux release build workflow and improve package installation;…

… add checks for window.docShell in ZenUIManager
zen-browser · Jan 6, 2025 · 6c4af27 · 6c4af27
1 parent 0333413
commit 6c4af27
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
@@ -16,7 +16,7 @@ jobs:
   build-linux:
     permissions:
       contents: write
-    runs-on: ${{ inputs.release-branch == 'release' && 'warp-ubuntu-latest-x64-8x' || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.arch == 'x86_64' && 'warp-ubuntu-latest-x64-8x' || 'ubuntu-latest' }}
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/src/release-build.sh b/.github/workflows/src/release-build.sh
@@ -3,8 +3,10 @@
 set -xe
 
 if command -v apt-get &> /dev/null; then
-  sudo apt-get update
-  sudo apt-get install -y xvfb
+  sudo add-apt-repository ppa:kisak/kisak-mesa
+  sudo apt update
+  sudo apt upgrade
+  sudo apt-get install -y xvfb libnvidia-egl-wayland1 mesa-utils libgl1-mesa-dri
 fi
 
 ulimit -n 4096

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
@@ -256,7 +256,9 @@ var gZenVerticalTabsManager = {
     try {
       this._updateMaxWidth();
 
-      window.docShell.treeOwner.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIAppWindow).rollupAllPopups();
+      if (window.docShell) {
+        window.docShell.treeOwner.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIAppWindow).rollupAllPopups();
+      }
 
       const topButtons = document.getElementById('zen-sidebar-top-buttons');
       const isCompactMode = this._prefsCompactMode && !forCustomizableMode;

diff --git a/src/testing/profiles/profileserver/user-js.patch b/src/testing/profiles/profileserver/user-js.patch
@@ -1,14 +1,15 @@
 diff --git a/testing/profiles/profileserver/user.js b/testing/profiles/profileserver/user.js
-index 19ff7d474f6d22d2d386764e2e6942ce6a324470..62fd56e53bc1cb7b688395badc97820d97a7c767 100644
+index 19ff7d474f6d22d2d386764e2e6942ce6a324470..40d1906bdebd08510014fd6124be17052248e748 100644
 --- a/testing/profiles/profileserver/user.js
 +++ b/testing/profiles/profileserver/user.js
-@@ -8,3 +8,10 @@
+@@ -8,3 +8,11 @@
  user_pref("dom.timeout.enable_budget_timer_throttling", false);
  // Turn off update
  user_pref("app.update.disabledForTesting", true);
 +
 +// zen:
 +// Disable some of zen's features to better match the default Firefox experience
++user_pref("zen.workspaces.enabled", false);
 +user_pref("zen.welcome-screen.enabled", false);
 +user_pref("zen.tab-unloader.enabled", false);
 +user_pref("zen.watermark.enabled", false);