Update Git configuration and improve release build scripts for consistency

This commit is contained in:
mr. M
2025-01-06 18:57:06 +01:00
parent d0911cd0c7
commit ee965e4b74
6 changed files with 10 additions and 19 deletions

View File

@@ -42,8 +42,8 @@ jobs:
- name: Setup Git
run: |
git config --global user.email "mauro-balades@users.noreply.github.com"
git config --global user.name "mauro-balades"
git config --global user.email "mr-cheff@users.noreply.github.com"
git config --global user.name "mr-cheff"
- name: Install system dependencies
run: |
@@ -129,15 +129,7 @@ jobs:
continue-on-error: true
run: |
export SURFER_PLATFORM="linux"
sh .github/workflows/src/release-build.sh
- name: Build again if it failed
if: failure()
env:
SURFER_COMPAT: ${{ matrix.arch }}
run: |
export SURFER_PLATFORM="linux"
sh .github/workflows/src/release-build.sh
bash .github/workflows/src/release-build.sh
- name: Package
env:

View File

@@ -118,7 +118,7 @@ jobs:
ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
run: |
export SURFER_PLATFORM="darwin"
sh .github/workflows/src/release-build.sh
bash .github/workflows/src/release-build.sh
- name: Import APPLE DEVELOPER ID CERTIFICATE for .app
uses: Apple-Actions/import-codesign-certs@v3

View File

@@ -1,6 +1,6 @@
#!/bin/bash
set -ex
set -xe
if command -v apt-get &> /dev/null; then
sudo apt-get update
@@ -9,7 +9,7 @@ fi
ulimit -n 4096
if ! command -v Xvfb &> /dev/null; then
if command -v Xvfb &> /dev/null; then
if ! test "$ZEN_CROSS_COMPILING"; then
Xvfb :2 -screen 0 1024x768x24 &
export LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata

View File

@@ -165,7 +165,7 @@ jobs:
if test ${{ inputs.generate-gpo }} = true; then
export ZEN_GA_GENERATE_PROFILE=1
fi
sh .github/workflows/src/release-build.sh
bash .github/workflows/src/release-build.sh
- name: Package
if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}

View File

@@ -128,7 +128,7 @@
#navigator-toolbox[movingtab],
#navigator-toolbox:has(.tabbrowser-tab:active),
#navigator-toolbox:has(
*:is([panelopen='true'], [open], #nav-bar:focus-within):not(tab):not(.zen-compact-mode-ignore)
*:is([panelopen='true'], [open='true'], #nav-bar:focus-within):not(tab):not(.zen-compact-mode-ignore)
) {
&:not([animate='true']) {
transition:

View File

@@ -1,15 +1,14 @@
diff --git a/testing/profiles/profileserver/user.js b/testing/profiles/profileserver/user.js
index 19ff7d474f6d22d2d386764e2e6942ce6a324470..40d1906bdebd08510014fd6124be17052248e748 100644
index 19ff7d474f6d22d2d386764e2e6942ce6a324470..62fd56e53bc1cb7b688395badc97820d97a7c767 100644
--- a/testing/profiles/profileserver/user.js
+++ b/testing/profiles/profileserver/user.js
@@ -8,3 +8,11 @@
@@ -8,3 +8,10 @@
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);