chore: Add macOS update manifest to alpha workflow

.github/workflows/alpha.yml

@@ -41,14 +41,6 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
       - name: Install dependencies
         run: pnpm install
 
@@ -101,14 +93,6 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
       - name: Install dependencies
         run: pnpm install
 
@@ -199,14 +183,6 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
       - name: Install dependencies
         run: pnpm install
 
@@ -451,8 +427,7 @@ jobs:
           path: ./zen.source.tar.gz
 
   mac:
-    if: false
-    runs-on: macos-13
+    runs-on: macos-14
     needs: [build-data, check-release]
 
     steps:
@@ -499,14 +474,6 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
       - name: Install dependencies
         run: pnpm install
       - name: Load surfer CI setup
@@ -525,7 +492,9 @@ jobs:
           cd ..
 
       - name: surfer build
-        run: pnpm build --verbose
+        run: |
+          export ZEN_RELEASE=1
+          pnpm build --verbose
 
       - name: Package
         run: pnpm package
@@ -557,7 +526,7 @@ jobs:
     if: ${{ github.event.inputs.create_release == 'true' }}
     permissions: write-all
     name: Release
-    needs: [build-data, linux, source, windows, check-release]
+    needs: [build-data, linux, source, windows, check-release, mac]
     runs-on: ubuntu-latest
 
     steps:
@@ -581,8 +550,10 @@ jobs:
             zen.source.tar.gz
             linux.mar
             windows.mar
+            macos.mar
             zen.installer.exe
             zen.installer.pretty.exe
+            zen.macos.dmg
 
       - name: List
         run: find .
@@ -600,6 +571,7 @@ jobs:
           mkdir -p updates
           cp -a ../linux_update_manifest/. updates/
           cp -a ../windows_update_manifest/.  updates/
+          cp -a ../macos_update_manifest/.  updates/
 
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:

configs/common/mozconfig

@@ -29,6 +29,8 @@ export MOZ_SOURCE_CHANGESET=${changeset}
 ac_add_options --enable-bootstrap
 
 ac_add_options --enable-application=browser
+
+if test "$ZEN_RELEASE"; then
   ac_add_options --enable-hardening
   ac_add_options --enable-rust-simd
   ac_add_options --enable-release
@@ -42,6 +44,7 @@ ac_add_options --disable-geckodriver
   ac_add_options --disable-parental-controls
   ac_add_options --disable-profiling
   ac_add_options --disable-tests
+fi
 
 ac_add_options --enable-unverified-updates
 ac_add_options --enable-updater
@@ -51,7 +54,9 @@ ac_add_options --without-wasm-sandboxed-libraries
 export MOZ_REQUIRE_SIGNING=
 export MOZ_TELEMETRY_REPORTING=
 
+if test "$ZEN_CROSS_COMPILING"; then
   ac_add_options --target=x86_64-pc-linux-gnu
+fi
 
 # ALWAYS MANTAIN ONE LINE BREAK AT THE END OF THIS FILE
 

configs/linux/mozconfig

@@ -20,6 +20,7 @@ if ! test "$ZEN_CROSS_COMPILING"; then
 
     ac_add_options --enable-linker=lld
     ac_add_options --enable-strip
+
 fi
 
 # Disable telemetry and tracking

configs/macos/mozconfig

@@ -1,14 +1,15 @@
-# Optimise builds
-ac_add_options --enable-application=browser
-ac_add_options --enable-hardening
-ac_add_options --enable-rust-simd
-ac_add_options --enable-release
-ac_add_options --enable-optimize
-ac_add_options --with-ccache=sccache
-ac_add_options --disable-debug
-ac_add_options --enable-updater
-mk_add_options MOZ_MAKE_FLAGS="-j4"
+POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
 
-# Disable telemetry and tracking
-mk_add_options MOZ_TELEMETRY_REPORTING=
-mk_add_options MOZ_DATA_REPORTING=
+if test "$ZEN_RELEASE"; then
+  ac_add_options --enable-optimize="-mcpu=apple-m1 -O3 -w"
+  ac_add_options --enable-release
+  ac_add_options --enable-rust-simd
+  ac_add_options RUSTC_OPT_LEVEL=3
+  export MOZILLA_OFFICIAL=1
+  export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=apple-m1"
+fi
+
+ac_add_options --enable-install-strip
+ac_add_options --target=aarch64-apple-darwin
+mk_add_options AUTOCLOBBER=1
+export MOZ_INCLUDE_SOURCE_INFO=1

package.json

@@ -26,6 +26,6 @@
   },
   "homepage": "https://github.com/zen-browser/core#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.0.13"
+    "@zen-browser/surfer": "^1.0.14"
   }
 }

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.0.13
-        version: 1.0.13
+        specifier: ^1.0.14
+        version: 1.0.14
 
 packages:
 
@@ -109,8 +109,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@zen-browser/surfer@1.0.13':
-    resolution: {integrity: sha512-1lM62lJbaLNQJNC/aYNpbdg3SNBno8HXEgsbFlYwS6hZ92aekO8qu1Uy7YlCvxq0jUB6iJ4AgjP4vKmItw5ZOQ==}
+  '@zen-browser/surfer@1.0.14':
+    resolution: {integrity: sha512-m7RWU4LqGuC4UvEAkho5H41b8T2zMZhN/dBrm+xugZ+rGRAHcw0NMjE3YDsjDr0/r3ZcKw4INPZGhhgSwIs2TA==}
     hasBin: true
 
   ansi-regex@5.0.1:
@@ -546,7 +546,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@zen-browser/surfer@1.0.13':
+  '@zen-browser/surfer@1.0.14':
     dependencies:
       '@resvg/resvg-js': 1.4.0
       async-icns: 1.0.2

src/browser/themes/shared/zen-browser-shared.css

@@ -378,6 +378,7 @@ toolbarbutton#scrollbutton-up {
 
 .tab-icon-overlay {
   margin-inline-end: 0 !important;
+  display: none !important; /* TODO: fix this */
 }
 
 /*#tabbrowser-arrowscrollbox {
@@ -450,6 +451,7 @@ panelmultiview {
 
 #tabbrowser-tabbox #tabbrowser-tabpanels .browserStack > browser {
   border-radius: var(--zen-browser-border-radius);
+  clip-path: inset(0px 0px 0px round var(--zen-browser-border-radius) 0) !important;
 }
 
 #nav-bar {

src/build/application-ini-in.patch

@@ -0,0 +1,11 @@
+diff --git a/build/application.ini.in b/build/application.ini.in
+index 6df13230a45b2a86356f4e5a7b189c46f53e44cc..47fc729cba7d9cb612bfa0297a24644925ab53af 100644
+--- a/build/application.ini.in
++++ b/build/application.ini.in
+@@ -52,5 +52,5 @@ ServerURL=@MOZ_CRASHREPORTER_URL@/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSIO
+ 
+ #if MOZ_UPDATER
+ [AppUpdate]
+-URL=https://@MOZ_APPUPDATE_HOST@/update/6/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml
++URL=https://@MOZ_APPUPDATE_HOST@/updates/browser/%BUILD_TARGET%/%CHANNEL%/update.xml
+ #endif

src/build/moz-build.patch

@@ -0,0 +1,13 @@
+diff --git a/build/moz.build b/build/moz.build
+index 7bf9c501db06d38f924c26372d4243d448af8d81..6042ccfcbfb838ffefe078a72eee00a83fb252f6 100644
+--- a/build/moz.build
++++ b/build/moz.build
+@@ -91,7 +91,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
+         if CONFIG[var]:
+             appini_defines[var] = True
+ 
+-    appini_defines["MOZ_APPUPDATE_HOST"] = "aus5.mozilla.org"
++    appini_defines["MOZ_APPUPDATE_HOST"] = "zen-updates.vercel.app"
+     if CONFIG["MOZ_APPUPDATE_HOST"]:
+         appini_defines["MOZ_APPUPDATE_HOST"] = CONFIG["MOZ_APPUPDATE_HOST"]
+ 

src/toolkit/locales/en-US/toolkit/branding/brandings-ftl.patch

@@ -0,0 +1,34 @@
+diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
+index cc95fbc3b8e1123b6bf3d0fb4cd35a456e413da4..9a090c6a238bdeada9e22514b21bd2b9d39a2b88 100644
+--- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl
++++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
+@@ -20,10 +20,10 @@
+ -mozmonitor-brand-name = Mozilla Monitor
+ -pocket-brand-name = Pocket
+ -send-brand-name = Firefox Send
+--screenshots-brand-name = Firefox Screenshots
++-screenshots-brand-name = Zen Screenshots
+ -mozilla-vpn-brand-name = Mozilla VPN
+--profiler-brand-name = Firefox Profiler
+--translations-brand-name = Firefox Translations
++-profiler-brand-name = Zen Profiler
++-translations-brand-name = Zen Translations
+ -focus-brand-name = Firefox Focus
+ -relay-brand-name = Firefox Relay
+ -relay-brand-short-name = Relay
+@@ -37,12 +37,12 @@
+ 
+ # “Suggest” can be localized, “Firefox” must be treated as a brand
+ # and kept in English.
+--firefox-suggest-brand-name = Firefox Suggest
++-firefox-suggest-brand-name = Zen Suggest
+ 
+ # ”Home" can be localized, “Firefox” must be treated as a brand
+ # and kept in English.
+--firefox-home-brand-name = Firefox Home
++-firefox-home-brand-name = Zen Home
+ 
+ # View" can be localized, “Firefox” must be treated as a brand
+ # and kept in English.
+--firefoxview-brand-name = Firefox View
++-firefoxview-brand-name = Zen View

surfer.json

@@ -27,7 +27,7 @@
       "brandShortName": "Zen Browser",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.0.0-a.0",
+        "displayVersion": "1.0.0-a.1",
         "github": {
           "repo": "zen-browser/desktop"
         },