Fix self-hosted runner stop script execution by decoding base64 and using bash

Signed-off-by: mr. m  <91018726+mauro-balades@users.noreply.github.com>

.dockerignore

@@ -0,0 +1,5 @@
+node_modules
+.git
+.DS_Store
+*.log
+engine

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -4,12 +4,13 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thank you for filing a bug report.
+        Thank you for filing a bug report!
 
         ## Important
         - Please search existing issues to avoid creating duplicates.
         - For enhancement requests, please use GitHub Discussions.
         - Please fill out the template below to the best of your ability.
+        - Please describe the issue as much as possible and provide steps to reproduce it along with visual aids if possible.
   - type: checkboxes
     id: captchas
     attributes:
@@ -38,7 +39,7 @@ body:
     id: version
     attributes:
       label: Version
-      description: What version of our software are you running? Please DO NOT report Classic bugs.
+      description: What version of our software are you running? Please do not use "latest" or "newest" as version numbers. Go to `Help -> About Zen` to find the version number.
       placeholder: 1.0.0
     validations:
       required: true
@@ -48,15 +49,18 @@ body:
       label: What platform are you seeing the problem on?
       multiple: true
       options:
-        - Linux
+        - Linux (AppImage)
+        - Linux (Flatpak)
+        - Linux (Tarball)
         - macOS - aarch64
         - macOS - Intel
         - Windows
+        - Other
     validations:
       required: true
   - type: textarea
     id: logs
     attributes:
-      label: Relevant log output
+      label: Relevant log output if applicable
       description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
       render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,5 @@
 blank_issues_enabled: false
+contact_links:
+  - name: Feature Request
+    url: https://github.com/zen-browser/desktop/discussions
+    about: Please use GitHub discussions for feature requests.

.github/workflows/build.yml

@@ -16,10 +16,10 @@ on:
       update_branch:
         description: 'Update branch with new version'
         required: true
-        default: 'alpha'
+        default: 'release'
         type: 'choice'
         options:
-          - 'alpha'
+          - 'release'
           - 'twilight'
   workflow_call:
     inputs:
@@ -36,7 +36,7 @@ on:
       update_branch:
         description: 'Update branch with new version'
         required: true
-        default: 'alpha'
+        default: 'release'
         type: 'string'
 
 jobs:
@@ -54,32 +54,56 @@ jobs:
           echo "GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}"
           echo "GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}"
 
+  start-self-host:
+    runs-on: ubuntu-latest
+    needs: debug-inputs
+    steps:
+      - name: Download aws-cli
+        run: |
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          sudo ./aws/install --update
+
+      - name: Start self-hosted runner
+        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          echo "Starting self-hosted runner"
+          echo "${{ secrets.SELF_HOSTED_RUNNER_START_SCRIPT }}" | base64 -d > start.sh
+          sudo chmod +x start.sh
+          bash ./start.sh
+
+      - name: Remove self-hosted runner script
+        if: always() && ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          echo "Removing self-hosted runner script"
+          rm start.sh || true
+
   check-build-is-correct:
     runs-on: ubuntu-latest
     needs: [debug-inputs]
     steps:
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
-          fetch-depth: 0
 
       - name: Check if correct branch
+        if: ${{ inputs.create_release }}
         run: |
           echo "Checking if we are on the correct branch"
           git branch
           git status
           git branch --show-current
           branch="${{ inputs.update_branch }}"
-          if [[ $branch == "alpha" ]]; then
-            branch="stable"
-          elif [[ $branch == "twilight" ]]; then
+          if [[ $branch == "twilight" ]]; then
             branch="dev"
+          elif [[ $branch == "release" ]]; then
+            branch="stable"
           fi
           if [[ $(git branch --show-current) != $branch ]]; then
             echo ">>> Branch mismatch"
-            exit 1
+          # exit 1
           else
             echo ">>> Branch matches"
           fi
@@ -95,17 +119,18 @@ jobs:
       version: ${{ steps.data.outputs.version }}
       build_time: ${{ steps.data.outputs.buildtime }}
     steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Install pnpm
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup pnpm
         run: npm install -g pnpm
 
       - name: Get pnpm store directory
@@ -115,14 +140,15 @@ jobs:
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
       - name: Install dependencies
-        run: pnpm install
+        run: |
+          pnpm install
 
       - name: Setup Surfer
         run: |
           npm i -g @zen-browser/surfer
 
       - name: Bump version
-        if: ${{ inputs.update_version && inputs.update_branch == 'alpha' }}
+        if: ${{ inputs.update_version && inputs.update_branch == 'release' }}
         run: |
           pnpm surfer ci --brand ${{ inputs.update_branch }} --bump prerelease
 
@@ -145,28 +171,35 @@ jobs:
           echo "version=$(surfer get version | xargs)" >> $GITHUB_OUTPUT
           echo "buildtime=$(date +"%H:%M:%S")" >> $GITHUB_OUTPUT
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
         if: ${{ inputs.update_version }}
         with:
           commit_message: 🔖 Update version to ${{ steps.data.outputs.version }}
           commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-bot@users.noreply.github.com
+          commit_user_email: zen-browser-auto@users.noreply.github.com
+
+  lint:
+    uses: ./.github/workflows/code-linter.yml
+    needs: [build-data]
+    name: Lint
 
   check-release:
     runs-on: ubuntu-latest
-    needs: [build-data]
+    needs: [build-data, lint]
     steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Install pnpm
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup pnpm
         run: npm install -g pnpm
 
       - name: Get pnpm store directory
@@ -176,15 +209,16 @@ jobs:
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
       - name: Install dependencies
-        run: pnpm install
+        run: |
+          pnpm install
 
-      - name: Setup surfer
+      - name: Setup Surfer
         run: |
           npm i -g @zen-browser/surfer
 
-      - name: Activate surfer CLI
+      - name: Activate Surfer CLI
         run: |
-          echo "There's a bug in the surfer CLI, we run this so that surfer sets everything up correctly"
+          echo "There's a bug in the Surfer CLI, we run this so that Surfer sets everything up correctly"
           pnpm surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
 
       - name: Check version
@@ -206,22 +240,23 @@ jobs:
     needs: [build-data, check-release]
 
     steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Setup git
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup Git
         run: |
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
 
-      - name: Install pnpm
+      - name: Setup pnpm
         run: npm install -g pnpm
 
       - name: Get pnpm store directory
@@ -231,12 +266,13 @@ jobs:
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
       - name: Install dependencies
-        run: pnpm install
+        run: |
+          pnpm install
 
-      - name: Load surfer CI setup
+      - name: Load Surfer CI setup
         run: pnpm surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
 
-      - name: Download firefox source and dependancies
+      - name: Download Firefox source and dependencies
         run: pnpm surfer download --verbose
 
       - name: Import
@@ -245,15 +281,15 @@ jobs:
       - name: Compress
         run: |
           cd engine
-          # -h is used to dereference symlinks
-          tar --use-compress-program=zstd -hcf ../zen.source.tar.gz *
+          tar --use-compress-program=zstd -hcf ../zen.source.tar.zst *
           cd ..
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: zen.source.tar.gz
-          path: ./zen.source.tar.gz
+          retention-days: 5
+          name: zen.source.tar.zst
+          path: ./zen.source.tar.zst
 
   windows-step-1:
     name: Windows build step 1 (PGO build)
@@ -265,7 +301,7 @@ jobs:
     with:
       build-version: ${{ needs.build-data.outputs.version }}
       generate-gpo: true
-      profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip
+      profile-data-path-archive: zen-windows-profile-data-and-jarlog.zip
       release-branch: ${{ inputs.update_branch }}
 
   windows-step-2:
@@ -286,7 +322,7 @@ jobs:
     permissions:
       contents: write
     secrets: inherit
-    needs: [build-data, windows-step-2]
+    needs: [build-data, windows-step-2, start-self-host]
     with:
       build-version: ${{ needs.build-data.outputs.version }}
       generate-gpo: false
@@ -298,7 +334,7 @@ jobs:
     permissions:
       contents: write
     secrets: inherit
-    needs: [build-data]
+    needs: [build-data, start-self-host]
     with:
       build-version: ${{ needs.build-data.outputs.version }}
       release-branch: ${{ inputs.update_branch }}
@@ -315,35 +351,36 @@ jobs:
       release-branch: ${{ inputs.update_branch }}
 
   appimage:
-    name: AppImage build - Linux ${{ matrix.generic == true && 'generic' || 'specific' }}
+    name: AppImage build - Linux ${{ matrix.arch }}
     permissions:
       contents: write
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        generic: [true, false]
+        arch: [x86_64, aarch64]
     needs: [linux]
     steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
       - name: Install dependencies
         run: |
           npm install -g pnpm
           sudo apt-get update
           sudo apt-get -y install libfuse2 desktop-file-utils appstream
 
-      - name: Download linux build
+      - name: Download Linux build
         uses: actions/download-artifact@v4
         with:
-          name: zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2
+          name: zen.linux-${{ matrix.arch }}.tar.bz2
 
       - name: Execute AppImage build
         run: |
@@ -354,7 +391,7 @@ jobs:
 
           if [ "${{ inputs.update_branch }}" = "twilight" ]; then
             sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' AppDir/zen.desktop
-            sed -i -e 's/StartupWMClass=zen-alpha/StartupWMClass=zen-twilight/g' AppDir/zen.desktop
+            sed -i -e 's/StartupWMClass=zen/StartupWMClass=zen-twilight/g' AppDir/zen.desktop
           fi
 
           APPDIR=AppDir
@@ -367,49 +404,78 @@ jobs:
           ls -al
           find .
           ls -al "$APPDIR"
-          ARCH=x86_64 ./appimagetool-x86_64.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 10 \
-          -u "gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|desktop|latest|zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage.zsync" \
-          "$APPDIR" zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
+          ARCH=${{ matrix.arch }} ./appimagetool-x86_64.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 10 \
+          -u "gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|desktop|latest|zen-${{ matrix.arch }}.AppImage.zsync" \
+          "$APPDIR" zen-${{ matrix.arch }}.AppImage
           mkdir dist
           mv zen*AppImage* dist/.
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
-          path: ./dist/zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
+          retention-days: 5
+          name: zen-${{ matrix.arch }}.AppImage
+          path: ./dist/zen-${{ matrix.arch }}.AppImage
 
       - name: Upload artifact (ZSync)
         uses: actions/upload-artifact@v4
         with:
-          name: zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage.zsync
-          path: ./dist/zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage.zsync
+          retention-days: 5
+          name: zen-${{ matrix.arch }}.AppImage.zsync
+          path: ./dist/zen-${{ matrix.arch }}.AppImage.zsync
+
+  stop-self-hosted:
+    runs-on: ubuntu-latest
+    needs: [windows-step-3, linux]
+    if: always()
+    steps:
+      - name: Download aws-cli
+        run: |
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          sudo ./aws/install --update
+
+      - name: Stop self-hosted runner
+        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          echo "Stopping self-hosted runner"
+          echo "${{ secrets.SELF_HOSTED_RUNNER_STOP_SCRIPT }}" | base64 -d > stop.sh
+          sudo chmod +x stop.sh
+          bash ./stop.sh > /dev/null 2>&1 &
+
+      - name: Remove self-hosted runner script
+        if: always() && ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          echo "Removing self-hosted runner script"
+          rm stop.sh || true
 
   release:
     if: ${{ inputs.create_release || inputs.update_branch == 'twilight' }}
     permissions: write-all
     name: Release
-    needs: [build-data, linux, windows-step-3, check-release, mac, appimage, source]
+    needs: [build-data, linux, windows-step-3, check-release, mac, appimage, source, lint, stop-self-hosted]
     runs-on: ubuntu-latest
     environment:
-      name: ${{ inputs.update_branch == 'alpha' && 'Deploy-Release' || 'Deploy-Twilight' }}
+      name: ${{ inputs.update_branch == 'release' && 'Deploy-Release' || 'Deploy-Twilight' }}
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Git Pull
+      - name: Git pull
         run: |
           git pull
 
-      - uses: actions/download-artifact@v4
+      - name: Download artifact
+        uses: actions/download-artifact@v4
 
       - name: List
         run: find .
 
-      - name: Clone updates repo
+      - name: Checkout updates repository
         uses: actions/checkout@v4
         with:
           repository: zen-browser/updates-server
@@ -426,98 +492,99 @@ jobs:
         run: |
           cd updates-server
           mkdir -p updates
-          cp -a ../linux_update_manifest_generic/.  updates/
-          cp -a ../linux_update_manifest_specific/.  updates/
+          cp -a ../linux_update_manifest_x86_64/.  updates/
+          cp -a ../linux_update_manifest_aarch64/.  updates/
 
-          if [[ $RELEASE_BRANCH == 'alpha' ]]; then
-            cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/.  updates/
-            cp -a ../.github/workflows/object/windows-x64-signed-specific/update_manifest/.  updates/
+          if [[ $RELEASE_BRANCH == 'release' ]]; then
+            cp -a ../.github/workflows/object/windows-x64-signed-x86_64/update_manifest/.  updates/
+            cp -a ../.github/workflows/object/windows-x64-signed-arm64/update_manifest/.  updates/
           else
-            cp -a ../windows_update_manifest_generic/.  updates/
-            cp -a ../windows_update_manifest_specific/.  updates/
+            cp -a ../windows_update_manifest_x86_64/.  updates/
+            cp -a ../windows_update_manifest_arm64/.  updates/
           fi
 
           cp -a ../macos_update_manifest_aarch64/.  updates/
-          cp -a ../macos_update_manifest_x64/.  updates/
+          cp -a ../macos_update_manifest_x86_64/.  updates/
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: 🚀 Update update manifests
           commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-bot@users.noreply.github.com
+          commit_user_email: zen-browser-auto@users.noreply.github.com
           repository: ./updates-server
 
-        # If we are on twilight, we want to just update the twilight tag's release
-      - name: Update twilight tag
+        # If we are on Twilight, we want to just update the Twilight tag's release
+      - name: Update Twilight tag
         if: ${{ inputs.update_branch == 'twilight' }}
-        uses: 'marvinpinto/action-automatic-releases@latest'
+        uses: marvinpinto/action-automatic-releases@master
         with:
           files: |
-            zen.source.tar.gz
-            zen.linux-generic.tar.bz2
-            zen.linux-specific.tar.bz2
-            zen-generic.AppImage
-            zen-generic.AppImage.zsync
-            zen-specific.AppImage
-            zen-specific.AppImage.zsync
-            zen.win-generic.zip
-            zen.win-specific.zip
+            zen.source.tar.zst
+            zen.linux-x86_64.tar.bz2
+            zen.linux-aarch64.tar.bz2
+            zen-x86_64.AppImage
+            zen-x86_64.AppImage.zsync
+            zen-aarch64.AppImage
+            zen-aarch64.AppImage.zsync
+            zen.win-x86_64.zip
+            zen.win-arm64.zip
             linux.mar
-            linux-generic.mar
-            windows-generic.mar
+            linux-aarch64.mar
             windows.mar
-            macos-x64.mar
+            windows-arm64.mar
+            macos-x86_64.mar
             macos-aarch64.mar
             zen.installer.exe
-            zen.installer-generic.exe
-            zen.macos-x64.dmg
+            zen.installer-arm64.exe
+            zen.macos-x86_64.dmg
             zen.macos-aarch64.dmg
           automatic_release_tag: 'twilight'
           title: 'Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})'
           draft: false
           prerelease: true
-          repo_token: ${{ github.token }}
+          repo_token: ${{ secrets.DEPLOY_KEY }}
         env:
           GITHUB_REPOSITORY: ${{ github.repository }}
 
-      - name: release-github
-        uses: 'marvinpinto/action-automatic-releases@latest'
-        if: ${{ inputs.update_branch == 'alpha' }}
+      - name: Release
+        uses: marvinpinto/action-automatic-releases@master
+        if: ${{ inputs.update_branch == 'release' }}
         with:
           repo_token: '${{ secrets.DEPLOY_KEY }}'
           automatic_release_tag: ${{ needs.build-data.outputs.version }}
           prerelease: false
-          title: 'Alpha build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
+          title: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
           files: |
-            zen.source.tar.gz
-            zen.linux-generic.tar.bz2
-            zen.linux-specific.tar.bz2
-            zen-generic.AppImage
-            zen-generic.AppImage.zsync
-            zen-specific.AppImage
-            zen-specific.AppImage.zsync
-            .github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip
-            .github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip
+            zen.source.tar.zst
+            zen.linux-x86_64.tar.bz2
+            zen.linux-aarch64.tar.bz2
+            zen-x86_64.AppImage
+            zen-x86_64.AppImage.zsync
+            zen-aarch64.AppImage
+            zen-aarch64.AppImage.zsync
+            .github/workflows/object/windows-x64-signed-x86_64/zen.win-x86_64.zip
+            .github/workflows/object/windows-x64-signed-arm64/zen.win-arm64.zip
             linux.mar
-            linux-generic.mar
-            .github/workflows/object/windows-x64-signed-generic/windows-generic.mar
-            .github/workflows/object/windows-x64-signed-specific/windows.mar
-            macos-x64.mar
+            linux-aarch64.mar
+            .github/workflows/object/windows-x64-signed-x86_64/windows.mar
+            .github/workflows/object/windows-x64-signed-arm64/windows-arm64.mar
+            macos-x86_64.mar
             macos-aarch64.mar
-            .github/workflows/object/windows-x64-signed-specific/zen.installer.exe
-            .github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe
-            zen.macos-x64.dmg
+            .github/workflows/object/windows-x64-signed-x86_64/zen.installer.exe
+            .github/workflows/object/windows-x64-signed-arm64/zen.installer-arm64.exe
+            zen.macos-x86_64.dmg
             zen.macos-aarch64.dmg
 
   prepare-flatpak:
-    if: ${{ inputs.create_release && inputs.update_branch == 'alpha' }}
+    if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
     permissions: write-all
     name: Prepare Flatpak
     needs: [release, linux, build-data]
     runs-on: ubuntu-latest
 
     steps:
-      - name: Clone flatpak repo
+      - name: Checkout Flatpak repository
         uses: actions/checkout@v4
         with:
           repository: zen-browser/release-utils
@@ -529,18 +596,19 @@ jobs:
           sudo apt-get update
           npm install
 
-      - name: Generate new flatpak release
+      - name: Generate new Flatpak release
         run: |
           npm run build-flatpak -- \
             --version ${{ needs.build-data.outputs.version }}
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: 🚀 Update releases for flatpak
+          commit_message: 🚀 Update releases for Flatpak
           commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-bot@users.noreply.github.com
+          commit_user_email: zen-browser-auto@users.noreply.github.com
 
-      - name: Clone flatpak repo
+      - name: Checkout Flatpak repository
         uses: actions/checkout@v4
         with:
           repository: zen-browser/flatpak
@@ -552,82 +620,90 @@ jobs:
           pwd
           ls .
           ls ..
-          mv releases.xml ./flatpak/io.github.zen_browser.zen.metainfo.xml
+          mv releases.xml ./flatpak/app.zen_browser.zen.metainfo.xml
           # output the version to the file
           echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: '[release]: Update flatpak manifest'
+          commit_message: '[release]: Update Flatpak manifest'
           commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-bot@users.noreply.github.com
+          commit_user_email: zen-browser-auto@users.noreply.github.com
           repository: ./flatpak
 
-      - name: Wait 4 minutes for the flatpak repo to update
-        run: sleep 240
+      - name: Wait 2 minutes for the Flatpak repo to update
+        run: sleep 120
 
   release-flatpak:
-    if: ${{ inputs.create_release && inputs.update_branch == 'alpha' }}
+    if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
     permissions: write-all
     name: Release Flatpak
     needs: [prepare-flatpak, build-data]
     runs-on: ubuntu-latest
 
     steps:
-      - name: Clone flatpak repo
+      - name: Checkout Flatpak repository
         uses: actions/checkout@v4
         with:
-          repository: flathub/io.github.zen_browser.zen
+          repository: flathub/app.zen_browser.zen
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Download linux generic build
+      - name: Download Linux x86_64 build
         uses: actions/download-artifact@v4
         with:
-          name: zen.linux-generic.tar.bz2
+          name: zen.linux-x86_64.tar.bz2
 
-      - name: Update repo
+      - name: Download Linux aarch64 build
+        uses: actions/download-artifact@v4
+        with:
+          name: zen.linux-aarch64.tar.bz2
+
+      - name: Update repository
         uses: actions/checkout@v4
         with:
           path: zen-browser
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Download flatpak archive
+      - name: Download Flatpak archive
         run: |
           wget https://github.com/zen-browser/flatpak/releases/latest/download/archive.tar -O archive.tar
 
-      - name: Setup git
+      - name: Setup Git
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: Prepare flatpak manifest
+      - name: Prepare Flatpak manifest
         run: |
           python3 ./zen-browser/scripts/prepare-flatpak-release.py \
             --flatpak-archive archive.tar \
             --version ${{ needs.build-data.outputs.version }} \
-            --linux-archive zen.linux-generic.tar.bz2 \
-            --output io.github.zen_browser.zen.yml \
+            --linux-archive zen.linux-x86_64.tar.bz2 \
+            --linux-aarch64-archive zen.linux-aarch64.tar.bz2 \
+            --output app.zen_browser.zen.yml \
             --template-root ./zen-browser/flatpak
 
       - name: Commit changes
         run: |
-          git add io.github.zen_browser.zen.yml
+          git add app.zen_browser.zen.yml
           git commit -m "Update to version ${{ needs.build-data.outputs.version }}"
 
       - name: Clean up
         run: |
           rm -rf zen-browser
           rm -rf archive.tar
-          rm -rf zen.linux-generic.tar.bz2
+          rm -rf zen.linux-x86_64.tar.bz2
 
-      - name: Upload flatpak manifest
+      - name: Upload Flatpak manifest
         uses: actions/upload-artifact@v4
         with:
-          name: io.github.zen_browser.zen.yml
-          path: ./io.github.zen_browser.zen.yml
+          retention-days: 5
+          name: app.zen_browser.zen.yml
+          path: ./app.zen_browser.zen.yml
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         env:
           GIT_TRACE: 1
           GIT_CURL_VERBOSE: 1
@@ -643,28 +719,3 @@ jobs:
           base: master
           git-token: ${{ secrets.DEPLOY_KEY }}
           delete-branch: true
-
-  release-homebrew:
-    if: ${{ inputs.create_release && inputs.update_branch == 'alpha' }}
-    permissions: write-all
-    name: Homebrew release
-    needs: [release, mac, build-data]
-    runs-on: macos-latest
-
-    steps:
-      - name: Set up Homebrew
-        uses: Homebrew/actions/setup-homebrew@master
-        with:
-          cask: true
-          test-bot: false
-
-      - name: Setup git
-        uses: Homebrew/actions/git-user-config@master
-        with:
-          username: zen-browser-bot
-
-      - name: Bump zen-browser
-        uses: Homebrew/actions/bump-packages@master
-        with:
-          token: ${{ secrets.DEPLOY_KEY }}
-          casks: zen-browser

.github/workflows/check-candidate-release.yml

@@ -0,0 +1,21 @@
+name: Check Firefox Candidate Release
+
+on:
+  schedule:
+    - cron: '0 21 * * 1'
+  workflow_dispatch:
+
+jobs:
+  check_candidates:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+
+      - name: Check for any updates
+        env:
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          DISCORD_PING_IDS: ${{ secrets.DISCORD_PING_IDS }}
+        run: |
+          python3 scripts/check_rc_response.py

.github/workflows/clear-cache.yml

@@ -9,9 +9,10 @@ permissions:
 jobs:
   clear-cache:
     runs-on: ubuntu-latest
+
     steps:
       - name: Clear cache
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             console.log("About to clear")
@@ -19,12 +20,14 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
             })
+
             for (const cache of caches.data.actions_caches) {
               console.log(cache)
-              github.rest.actions.deleteActionsCacheById({
+              await github.rest.actions.deleteActionsCacheById({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 cache_id: cache.id,
               })
             }
+
             console.log("Clear completed")

.github/workflows/code-linter.yml

@@ -0,0 +1,37 @@
+name: Code Linter
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+  workflow_call:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  pr-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup autopep8
+        run: sudo apt install python3-autopep8
+
+      - name: Setup pnpm
+        run: npm install -g pnpm
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Lint
+        run: pnpm lint

.github/workflows/issue-metrics.yml

@@ -0,0 +1,64 @@
+name: Monthly issue metrics
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '3 2 1 * *'
+
+jobs:
+  build:
+    name: issue metrics
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Get dates for last month
+        shell: bash
+        run: |
+          # Get the current date
+          current_date=$(date +'%Y-%m-%d')
+
+          # Calculate the previous month
+          previous_date=$(date -d "$current_date -1 month" +'%Y-%m-%d')
+
+          # Extract the year and month from the previous date
+          previous_year=$(date -d "$previous_date" +'%Y')
+          previous_month=$(date -d "$previous_date" +'%m')
+
+          # Calculate the first day of the previous month
+          first_day=$(date -d "$previous_year-$previous_month-01" +'%Y-%m-%d')
+
+          # Calculate the last day of the previous month
+          last_day=$(date -d "$first_day +1 month -1 day" +'%Y-%m-%d')
+
+          echo "$first_day..$last_day"
+          echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
+          echo "last_month_year=$previous_year" >> "$GITHUB_ENV"
+
+      - name: Run issue-metrics tool
+        uses: github/issue-metrics@v2
+        env:
+          GH_TOKEN: ${{ secrets.DEPLOY_KEY }}
+          HIDE_AUTHOR: true
+          HIDE_TIME_TO_ANSWER: true
+          SEARCH_QUERY: 'repo:zen-browser/desktop is:issue created:${{ env.last_month }}'
+
+      - name: Move metrics to docs folder
+        run: |
+          mkdir -p docs/issue-metrics
+          rm -f docs/issue-metrics/${{ env.last_month_year }}_${{ env.last_month }}.md
+          mv issue_metrics.md docs/issue-metrics/${{ env.last_month_year }}_${{ env.last_month }}.md
+
+      - name: Remove metrisc JSON
+        run: |
+          rm -f issue_metrics.json
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'Update monthly issue metrics'
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-auto@users.noreply.github.com

.github/workflows/linux-release-build.yml

@@ -1,4 +1,5 @@
 name: Linux Release Build
+
 on:
   workflow_call:
     inputs:
@@ -13,35 +14,34 @@ on:
 
 jobs:
   build-linux:
-    
     permissions:
       contents: write
-    runs-on: ubuntu-latest
+    # aarch64 does not need full 16x
+    runs-on: ${{ (inputs.release-branch == 'release' && matrix.arch == 'x86_64') && 'self-hosted' || 'ubuntu-latest' }}
     strategy:
       fail-fast: false
       matrix:
-        generic: [true, false]
-    name: Build Linux - ${{ matrix.generic == true && 'Generic' || 'Specific' }}
+        arch: [x86_64, aarch64]
+    name: Build Linux - ${{ matrix.arch }}
 
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
         with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
           tool-cache: false
 
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Setup git
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup Git
         run: |
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
@@ -51,7 +51,7 @@ jobs:
           set -x
           sudo apt-get update --fix-missing
           sudo apt-get update
-          sudo apt-get install dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm
+          sudo apt-get install -y python3 python3-pip dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm
 
       - name: Configure sccache
         uses: actions/github-script@v7
@@ -60,7 +60,7 @@ jobs:
             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
-      - name: Install sccache
+      - name: Setup sccache
         env:
           LINK: https://github.com/mozilla/sccache/releases/download
           SCCACHE_VERSION: 0.2.13
@@ -72,13 +72,12 @@ jobs:
           echo "$HOME/.local/bin" >> $GITHUB_PATH
 
       - name: Save sccache
-        uses: actions/cache@v3
-        continue-on-error: false
+        uses: actions/cache@v4
         with:
           path: /home/runner/.cache/sccache
           key: ${{ runner.os }}-sccache
 
-      - name: Install pnpm
+      - name: Setup pnpm
         run: npm install -g pnpm
 
       - name: Get pnpm store directory
@@ -88,23 +87,30 @@ jobs:
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
       - name: Install dependencies
-        run: pnpm install
+        run: |
+          pnpm install
 
-      - name: Load surfer CI setup
+      - name: Load Surfer CI setup
         run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
-      - name: Download firefox source and dependencies
+      - name: Download Firefox source and dependencies
         run: pnpm surfer download
 
-      - name: Fix rust version
+      - name: Fix Rust version
         run: |
           # Install a rust version compatible with LLVM 18
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
           source $HOME/.cargo/env
 
+          if test "${{ matrix.arch }}" = "aarch64"; then
+            rustup target add aarch64-unknown-linux-gnu
+          else
+            rustup target add x86_64-unknown-linux-gnu
+          fi
+
       - name: Import
         env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
+          SURFER_COMPAT: ${{ matrix.arch }}
         run: pnpm surfer import
 
       - name: Build language packs
@@ -113,45 +119,50 @@ jobs:
       - name: Bootstrap
         run: |
           cd engine
+          export SURFER_PLATFORM="linux"
           ./mach --no-interactive bootstrap --application-choice browser
           cd ..
 
       - name: Build
         env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
         continue-on-error: true
-        run: sh .github/workflows/src/release-build.sh
-
-      - name: Build again if it failed
-        if: failure()
-        env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
-        run: sh .github/workflows/src/release-build.sh
+        run: |
+          export SURFER_PLATFORM="linux"
+          bash .github/workflows/src/release-build.sh
 
       - name: Package
         env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
-        run: pnpm package
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_GA_DISABLE_PGO: true
+        run: |
+          export SURFER_PLATFORM="linux"
+          export ZEN_RELEASE=1
+          pnpm package
 
       - name: Rename artifacts
         run: |
-          mv dist/zen-*.tar.bz2 "zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2"
-          mv dist/output.mar linux${{ matrix.generic == true && '-generic' || '' }}.mar
+          mv dist/zen-*.tar.bz2 "zen.linux-${{ matrix.arch }}.tar.bz2"
+          mv dist/output.mar linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
 
-      - name: Upload binary
+      - name: Upload build artifact (binary)
         uses: actions/upload-artifact@v4
         with:
-          name: zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2
-          path: ./zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2
+          retention-days: 5
+          name: zen.linux-${{ matrix.arch }}.tar.bz2
+          path: ./zen.linux-${{ matrix.arch }}.tar.bz2
 
-      - name: Upload mar
+      - name: Upload build artifact (.mar)
         uses: actions/upload-artifact@v4
         with:
-          name: linux${{ matrix.generic == true && '-generic' || '' }}.mar
-          path: ./linux${{ matrix.generic == true && '-generic' || '' }}.mar
+          retention-days: 5
+          name: linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
+          path: ./linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
 
-      - name: Upload update manifests
+      - name: Upload build artifact (update manifests)
         uses: actions/upload-artifact@v4
         with:
-          name: linux_update_manifest_${{ matrix.generic == true && 'generic' || 'specific' }}
+          retention-days: 5
+          name: linux_update_manifest_${{ matrix.arch }}
           path: ./dist/update

.github/workflows/macos-release-build.yml

@@ -1,4 +1,5 @@
 name: macOS Release Build
+
 on:
   workflow_call:
     inputs:
@@ -14,33 +15,30 @@ on:
 jobs:
   mac-build:
     name: Build macOS - ${{ matrix.arch }}
+    runs-on: ${{ inputs.release-branch == 'release' && 'macos-14' || 'macos-14' }}
 
-    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - arch: aarch64
-            os: macos-14
-          - arch: x64
-            os: macos-13
+        arch: [x86_64, aarch64]
 
     steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Setup git
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        # note: This will use the version defined in '.python-version' by default
+
+      - name: Setup Git
         run: |
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
@@ -48,43 +46,38 @@ jobs:
       - name: Install system dependencies
         run: |
           brew update
-
           brew install cairo sccache gnu-tar mercurial
           sudo pip install setuptools
 
-          # completly uninstall python3 and python3.12
           brew uninstall --ignore-dependencies python3.12 -f
 
           export PATH="$(python3 -m site --user-base)/bin":$PATH
           python3 -m pip install --user mercurial
 
-          rm '/usr/local/bin/2to3-3.11' # fix Could not symlink bin/2to3-3.11
-          rm '/usr/local/bin/2to3-3.12' # fix Could not symlink bin/2to3-3.12
-          rm /usr/local/bin/2to3 # fix Could not symlink bin/2to3
-          rm '/usr/local/bin/idle3.11' #fix Could not symlink bin/idle3.11
-          rm '/usr/local/bin/idle3.12' # fix Could not symlink bin/idle3.12
-          rm '/usr/local/bin/idle3' # fix Could not symlink bin/idle3
-          rm '/usr/local/bin/pydoc3.11' # fix Could not symlink bin/pydoc3.11
-          rm '/usr/local/bin/pydoc3.12' # fix Could not symlink bin/pydoc3.12
-          rm '/usr/local/bin/pydoc3' # fix Could not symlink bin/pydoc3
-          rm '/usr/local/bin/python3.11' # fix Could not symlink bin/python3.11
-          rm '/usr/local/bin/python3.12' # fix Could not symlink bin/python3.12
-          rm '/usr/local/bin/python3' # fix Could not symlink bin/python3
-          rm '/usr/local/bin/python3.11-config' # fix Could not symlink bin/python3.11-config
-          rm '/usr/local/bin/python3.12-config' # fix Could not symlink bin/python3.12-config
-          rm '/usr/local/bin/python3-config' # fix Could not symlink bin/python3-config
+          rm '/usr/local/bin/2to3-3.11' '/usr/local/bin/2to3-3.12' '/usr/local/bin/2to3'
+          rm '/usr/local/bin/idle3.11' '/usr/local/bin/idle3.12' '/usr/local/bin/idle3'
+          rm '/usr/local/bin/pydoc3.11' '/usr/local/bin/pydoc3.12' '/usr/local/bin/pydoc3'
+          rm '/usr/local/bin/python3.11' '/usr/local/bin/python3.12' '/usr/local/bin/python3'
+          rm '/usr/local/bin/python3.11-config' '/usr/local/bin/python3.12-config' '/usr/local/bin/python3-config'
 
           brew install watchman
 
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
+          source $HOME/.cargo/env
 
-      - name: Force usage fo gnu-tar
+          if test "${{ matrix.arch }}" = "aarch64"; then
+            rustup target add aarch64-apple-darwin
+          else
+            rustup target add x86_64-apple-darwin
+          fi
+
+      - name: Force usage of gnu-tar
         run: |
           echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.bash_profile
           echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.zsh
           source ~/.bash_profile
 
-      - name: Install pnpm
+      - name: Setup pnpm
         run: npm install -g pnpm
 
       - name: Get pnpm store directory
@@ -94,60 +87,72 @@ jobs:
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
       - name: Install dependencies
-        run: pnpm install
+        run: |
+          pnpm install
+
       - name: Load surfer CI setup
         run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
-      - name: Download firefox source and dependancies
+      - name: Download Firefox source and dependencies
         run: pnpm surfer download
 
       - name: Bootstrap
         run: |
           cd engine
+          export SURFER_PLATFORM="darwin"
           export PATH="$(python3 -m site --user-base)/bin":$PATH
           ./mach --no-interactive bootstrap --application-choice browser --no-system-changes
           cd ..
 
       - name: Import
         env:
-          SURFER_COMPAT: ${{ matrix.arch == 'x64' }}
-        run: |
-          pnpm surfer import --verbose
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: pnpm surfer import --verbose
 
       - name: Build language packs
         run: sh scripts/download-language-packs.sh
 
-      - name: build Zen
+      - name: Build Zen
         env:
-          SURFER_COMPAT: ${{ matrix.arch == 'x64' }}
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
         run: |
-          if test "${{ matrix.arch }}" = "x64"; then
-            export ZEN_DISABLE_LTO=1
-          fi
-          sh .github/workflows/src/release-build.sh
+          export SURFER_PLATFORM="darwin"
+          bash .github/workflows/src/release-build.sh
 
-      - name: Rebuild Zen if failed
-        if: failure()
-        run: sh .github/workflows/src/release-build.sh
-
-      - name: import APPLE DEVELOPER ID CERTIFICATE for .app
-        uses: apple-actions/import-codesign-certs@v3
+      - name: Import APPLE DEVELOPER ID CERTIFICATE for .app
+        uses: Apple-Actions/import-codesign-certs@v3
         with:
           p12-file-base64: ${{ secrets.macOS_CERTIFICATES_P12_For_App_BASE64 }}
           p12-password: ${{ secrets.macOS_CERTIFICATES_P12_PASSWORD }}
 
+      - name: Import provisioning profile for .app
+        run: |
+          echo "${{ secrets.macOS_PROVISIONING_PROFILE }}" | base64 --decode > ./engine/Zen_Browser.provisionprofile
+          ls -la
+
       - name: Package
         env:
-          SURFER_COMPAT: ${{ matrix.arch == 'x64' }}
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_GA_DISABLE_PGO: true
+          MACOS_APPLE_ACCOUNT_ID: ${{ secrets.macOS_AppleAccountId }}
+          MACOS_APPLE_DEVELOPER_ID_TEAM_ID: ${{ secrets.macOS_AppleDeveloperIdTeamId }}
+          MACOS_APPLE_DEVELOPER_ID_PASSWORD: ${{ secrets.macOS_AppleDeveloperIdPassword }}
         run: |
+          export SURFER_PLATFORM="darwin"
           export MACOS_APPLE_DEVELOPER_ID="${{ secrets.macOS_AppleDeveloperId }}"
+          export ZEN_RELEASE=1
           pnpm package
 
       - name: Rename artifacts
         run: |
           mv ./dist/output.mar macos-${{ matrix.arch }}.mar
 
-      - name: Sign to .dmg
+      - name: Remove sensitive information
+        run: |
+          rm -f ./engine/Zen_Browser.provisionprofile
+
+      - name: Sign .dmg
         run: |
           set -ex
           hdiutil convert ./dist/*.dmg -format UDZO -imagekey zlib-level=9 -o zen.macos-${{ matrix.arch }}.dmg
@@ -157,23 +162,28 @@ jobs:
             --apple-id "${{ secrets.macOS_AppleAccountId }}" \
             --team-id "${{ secrets.macOS_AppleDeveloperIdTeamId }}" \
             --password "${{ secrets.macOS_AppleDeveloperIdPassword }}" \
+            --no-s3-acceleration \
+            --verbose \
             --wait
           xcrun stapler staple "zen.macos-${{ matrix.arch }}.dmg"
 
-      - name: Upload artifact
+      - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
+          retention-days: 5
           name: zen.macos-${{ matrix.arch }}.dmg
           path: ./zen.macos-${{ matrix.arch }}.dmg
 
-      - name: Upload mar
+      - name: Upload build artifact (.mar)
         uses: actions/upload-artifact@v4
         with:
+          retention-days: 5
           name: macos-${{ matrix.arch }}.mar
           path: ./macos-${{ matrix.arch }}.mar
 
-      - name: Upload update manifests
+      - name: Upload build artifact (update manifests)
         uses: actions/upload-artifact@v4
         with:
+          retention-days: 5
           name: macos_update_manifest_${{ matrix.arch }}
           path: ./dist/update

.github/workflows/pr-test.yml

@@ -1,4 +1,3 @@
-
 name: Pull request test
 
 on:
@@ -11,26 +10,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: recursive
 
-      - name: Install Node.js and pnpm
-        uses: actions/setup-node@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: '.nvmrc'
 
-      - name: Install pnpm
+      - name: Setup pnpm
         run: npm install -g pnpm
 
       - name: Install Surfer
-        run: |
-          npm i -g @zen-browser/surfer
+        run: npm i -g @zen-browser/surfer
 
-      - name: Download firefox
-        run: |
-          surfer download
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Download Firefox and dependencies
+        run: surfer download
 
       - name: Import patches
-        run: |
-          surfer i
+        run: surfer i

.github/workflows/src/release-build.sh

@@ -1,17 +1,18 @@
-set -ex
+#!/bin/bash
 
-if command -v apt-get &> /dev/null
-then
+set -xe
+
+if command -v apt-get &> /dev/null; then
+  sudo add-apt-repository ppa:kisak/kisak-mesa
   sudo apt-get update
-  sudo apt-get install -y xvfb
+  sudo apt-get install -y xvfb libnvidia-egl-wayland1 mesa-utils libgl1-mesa-dri
 fi
 
 ulimit -n 4096
 
-# Check if xfvb is installed
-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 &
+    Xvfb :2 -nolisten tcp -noreset -screen 0 1024x768x24 &
     export LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata
     export DISPLAY=:2
   fi
@@ -20,6 +21,7 @@ if ! command -v Xvfb &> /dev/null; then
 else
   echo "Xvfb could not be found, running without it"
   echo "ASSUMING YOU ARE RUNNING THIS ON MACOS"
+
   set -v
   export ZEN_RELEASE=1
   pnpm build

.github/workflows/twilight-release-schedule.yml

@@ -1,8 +1,15 @@
 name: Zen Twilight Scheduled Releases
+
 on:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 23 * * *'
   workflow_dispatch:
+    inputs:
+      create_release:
+        description: 'Whether to do a release'
+        required: false
+        type: boolean
+        default: true
 
 jobs:
   twilight-release-schedule:
@@ -11,7 +18,7 @@ jobs:
     secrets: inherit
     uses: ./.github/workflows/build.yml
     with:
-      create_release: true
+      create_release: ${{ github.event_name != 'workflow_dispatch' && true || inputs.create_release }}
       update_branch: twilight
       update_version: false
 
@@ -20,12 +27,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: twilight-release-schedule
     steps:
-      - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install Node.js and pnpm
-        uses: actions/setup-node@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
-
-      # TODO:
+          node-version-file: '.nvmrc'

.github/workflows/update-submodules.yml

@@ -1,4 +1,3 @@
-
 name: Update Components Submodules
 
 on:
@@ -6,25 +5,27 @@ on:
     branches:
       - dev
   workflow_dispatch:
-  workflow_call: # This is a custom event that we will trigger manually
+  workflow_call:
 
 jobs:
   update-submodules:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
+
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
       - name: Update submodules
         run: |
           git submodule update --remote --merge
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: "[skip ci] 📦 Update Submodules!"
+          commit_message: '[skip ci] 📦 Update submodules'
           commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-bot@users.noreply.github.com
+          commit_user_email: zen-browser-auto@users.noreply.github.com

.github/workflows/windows-profile-build.yml

@@ -1,4 +1,5 @@
 name: Windows PGO Builds
+
 on:
   workflow_call:
     inputs:
@@ -17,59 +18,72 @@ on:
 
 jobs:
   windows-profile-build:
-    name: Windows Profile Build - ${{ matrix.generic == true && 'generic' || 'specific' }}
+    name: |
+      Windows Profile Build - ${{ matrix.arch }}
     strategy:
       fail-fast: false
       matrix:
-        generic: [true, false]
-    runs-on: windows-latest
-    # Script edited from https://github.com/Floorp-Projects/Floorp/blob/ESR115/.github/workflows/window-generate-profile-data-and-jarlog.yml
+        arch: [x86_64, aarch64]
+
+    runs-on: ${{ inputs.release-branch == 'release' && 'windows-latest' || 'windows-latest' }}
+
     steps:
-      - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install Node.js and pnpm
-        uses: actions/setup-node@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: '.nvmrc'
 
-      - name: Setup git
+      - name: Setup Git
         run: |
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
-      - name: Install pnpm
+
+      - name: Setup pnpm
         run: npm install -g pnpm
 
       - name: Install Surfer
-        run: |
-          npm i -g @zen-browser/surfer
-      - uses: actions/download-artifact@v4
-        name: Download artifact
+        run: npm i -g @zen-browser/surfer
+
+      - name: Load Surfer CI setup
+        run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+
+      - name: Download artifact
+        if: ${{ matrix.arch == 'x86_64' }}
+        uses: actions/download-artifact@v4
         with:
           path: C:\artifact
-          name: ${{ matrix.generic == true && 'generic' || 'specific' }}-zen-windows-x86_64-profile-data-and-jarlog.zip
+          name: ${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-zen-windows-profile-data-and-jarlog.zip
 
       - name: Unpack artifact
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
           cd C:\artifact
           ls
           Expand-Archive -Path .\${{ inputs.profile-data-path-archive }} -DestinationPath C:\artifact
           ls
+
       - name: Setup
         run: |
           (New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe", "C:\MozillaBuildSetup-Latest.exe")
           C:\MozillaBuildSetup-Latest.exe /S | out-null
-      - name: Download firefox
+
+      - name: Download Firefox and dependencies
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
           git config --global core.safecrlf false
           pnpm surfer download
 
       - name: Import patches
+        if: ${{ matrix.arch == 'x86_64' }}
         env:
           SURFER_NO_BRANDING_PATCH: true
         run: pnpm surfer import
 
       - name: Generate
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
           ls
           $Env:USE_MINTTY = "0"
@@ -83,22 +97,25 @@ jobs:
           echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/zen/zen.exe' '' >> mozilla-build-run.sh
           C:\mozilla-build\start-shell.bat $workspace_dir_current\mozilla-build-run.sh
 
-      - name: 🐛 Debug Session
+      - name: Debug session
         if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
+        uses: WarpBuilds/action-debugger@v1.3
         timeout-minutes: 15
 
       - name: Move profile data
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
           dir
           dir engine
           mv engine/merged.profdata merged.profdata
           mv engine/en-US.log en-US.log
 
-      - name: Publish artifacts
+      - name: Upload artifacts
+        if: ${{ matrix.arch == 'x86_64' }}
         uses: actions/upload-artifact@v4
         with:
+          retention-days: 1
           path: |
             merged.profdata
             en-US.log
-          name: windows-profdata-${{ matrix.generic == true && 'generic' || 'specific' }}
+          name: windows-profdata-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}

.github/workflows/windows-release-build.yml

@@ -1,4 +1,5 @@
 name: Windows Release Build
+
 on:
   workflow_call:
     inputs:
@@ -20,50 +21,54 @@ on:
 
 jobs:
   windows-build:
-    name: Build Windows - ${{ matrix.generic == true && 'Generic' || 'Specific' }}
-    runs-on: ubuntu-latest
+    name: Build Windows - ${{ matrix.arch }}
+    # aarch64 does not need full 16x, and we also dont use full LTO when generating GPO
+    runs-on: ${{ (inputs.release-branch == 'release' && !inputs.generate-gpo && matrix.arch == 'x86_64') && 'self-hosted' || 'ubuntu-latest' }}
+
     strategy:
       fail-fast: false
       matrix:
-        generic: [true, false]
+        arch: [x86_64, aarch64]
 
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
           tool-cache: false
 
-      - name: Install Node.js and pnpm
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Install pnpm
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup pnpm
         run: npm install -g pnpm
 
-      - name: Setup git
+      - name: Setup Git
         run: |
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
 
       - name: Install dependencies
         run: |
-          pnpm i
+          pnpm install
+          sudo apt-get install -y python3 python3-pip dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm
 
-      - name: Load surfer CI setup
+      - name: Load Surfer CI setup
         run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
-      - name: Download
+      - name: Download Firefox and dependencies
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         run: pnpm surfer download
 
-      - name: 'win-cross Cache'
+      - name: win-cross Cache
         env:
           SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
         id: cache-win-cross
@@ -79,89 +84,129 @@ jobs:
             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
-      - name: Setup For Windows
-        if: steps.cache-win-cross.outputs.cache-hit != 'true'
+      - name: Setup for Windows
+        if: steps.cache-win-cross.outputs.cache-hit != 'true' && !(inputs.generate-gpo && matrix.arch == 'aarch64')
         run: |
           set -x
           mkdir -p ~/win-cross
           cd engine/
-
+          sudo add-apt-repository ppa:savoury1/backports
+          sudo apt-get update
+          sudo apt-get install -y python3-pip autoconf \
+            autoconf2.13 \
+            automake \
+            bison \
+            build-essential \
+            cabextract \
+            curl \
+            cmake \
+            flex \
+            gawk \
+            gcc-multilib \
+            git \
+            gnupg \
+            jq \
+            libbz2-dev \
+            libexpat1-dev \
+            libffi-dev \
+            libncursesw5-dev \
+            libsqlite3-dev \
+            libssl-dev \
+            libtool \
+            libucl-dev \
+            libxml2-dev \
+            msitools \
+            ninja-build \
+            openssh-client \
+            p7zip-full \
+            pkg-config \
+            procps \
+            python3-requests \
+            python3-toml \
+            scons \
+            subversion \
+            tar \
+            unzip \
+            uuid \
+            uuid-dev \
+            wget \
+            zip \
+            zlib1g-dev \
+            aria2
           echo Setup wine
           aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-1.toolchains.v3.linux64-wine.latest/artifacts/public%2Fbuild%2Fwine.tar.zst" -o wine.tar.zst
           tar --zstd -xvf wine.tar.zst -C ~/win-cross
           rm wine.tar.zst
-
           echo Setup Visual Studio
-          sudo apt install -y msitools python3-pip
           ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022
 
       - name: Bootstrap
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         run: |
           set -x
           cd engine/
-
           chmod -R +x "$(echo ~)/win-cross/vs2022" || true
-
           cd ..
           npm install -g pnpm
           export SURFER_PLATFORM="win32"
           pnpm surfer bootstrap
-
           cd engine/
           ls ~/.mozbuild/clang/lib/clang/
           echo "export LIB=\"$(cd ~/.mozbuild/clang/lib/clang/* && cd lib/windows && pwd)\"" >> ../configs/common/mozconfig
           cat ../configs/common/mozconfig
-
           sudo apt-get update
           sudo apt-get install dos2unix
-
           ls ~/win-cross/wine || true
           ls ~/win-cross/vs2022 || true
 
-      - name: setup Rust
+      - name: Setup Rust
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         run: |
           cd engine/
-          # Install a rust version compatible with 17
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
           source $HOME/.cargo/env
-
+          if test "${{ matrix.arch }}" = "aarch64"; then
+            rustup target add aarch64-pc-windows-msvc
+          else
             rustup target add x86_64-pc-windows-msvc
+          fi
           cargo install cargo-download
           cargo download -x windows=0.58.0
-          #? https://github.com/mozilla/sccache#known-caveats
           export CARGO_INCREMENTAL=0
-
           echo "" >> ../configs/common/mozconfig
           echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-0.58.0" >> ../configs/common/mozconfig
 
       - name: Import
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
+          SURFER_COMPAT: ${{ matrix.arch }}
         run: pnpm surfer import --verbose
 
       - name: Build language packs
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         run: sh scripts/download-language-packs.sh
 
-      - uses: actions/download-artifact@v4
-        name: Download artifact if use profdata
-        if: ${{ !inputs.generate-gpo }}
+      - name: Download artifact (if use profdata)
+        uses: actions/download-artifact@v4
+        if: ${{ !inputs.generate-gpo && matrix.arch == 'x86_64' }}
         with:
           path: ~/artifact
-          name: windows-profdata-${{ matrix.generic == true && 'generic' || 'specific' }}
+          name: windows-profdata-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
 
       - name: Show artifact info
-        if: ${{ !inputs.generate-gpo }}
+        if: ${{ !inputs.generate-gpo && matrix.arch == 'x86_64' }}
         run: |
           ls ~/artifact
           ls ~/artifact/en-US.log
           ls ~/artifact/merged.profdata
-
           chmod +x ~/artifact/en-US.log
           chmod +x ~/artifact/merged.profdata
 
       - name: Build
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
         env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
         run: |
           set -x
           dos2unix configs/windows/mozconfig
@@ -170,26 +215,30 @@ 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') }}
         env:
-          SURFER_COMPAT: ${{ matrix.generic == true }}
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_GA_DISABLE_PGO: true
         run: |
           set -x
           export SURFER_PLATFORM="win32"
+          export ZEN_CROSS_COMPILING=1
+          export ZEN_RELEASE=1
           pnpm package
-          mv ./dist/zen-$(pnpm surfer get version | xargs).en-US.win64.zip zen.win64.zip
+          mv ./dist/zen-$(pnpm surfer get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
           ls ./dist
           ls .
 
-      - name: 🐛 Debug Session
+      - name: Debug session
         if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
+        uses: WarpBuilds/action-debugger@v1.3
         timeout-minutes: 15
 
       - name: Move package for PGO upload
-        if: ${{ inputs.generate-gpo }}
+        if: ${{ inputs.generate-gpo && matrix.arch == 'x86_64' }}
         run: |
           set -x
           mv ./zen.win64.zip ./zen.win64-pgo-stage-1.zip
@@ -197,55 +246,66 @@ jobs:
       - name: Rename artifacts
         if: ${{ !inputs.generate-gpo }}
         run: |
-          mv ./zen.win64.zip zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
-          mv ./dist/output.mar windows${{ matrix.generic == true && '-generic' || '' }}.mar
-          mv ./dist/zen.installer.exe ./zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
+          mv ./zen.win64.zip zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.zip
+          mv ./dist/output.mar windows${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.mar
+          mv ./dist/zen.installer.exe ./zen.installer${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.exe
 
-      - name: Upload PGO build
+      - name: Upload artifact (PGO)
         uses: actions/upload-artifact@v4
-        if: ${{ inputs.generate-gpo }}
+        if: ${{ inputs.generate-gpo && matrix.arch == 'x86_64' }}
         with:
-          name: ${{ matrix.generic == true && 'generic' || 'specific' }}-${{ inputs.profile-data-path-archive }}
+          retention-days: 5
+          name: ${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-${{ inputs.profile-data-path-archive }}
           path: ./zen.win64-pgo-stage-1.zip
 
       - name: Remove unnecessary files from obj
         if: ${{ !inputs.generate-gpo }}
         run: |
           set -x
+          if test "${{ matrix.arch }}" = "aarch64"; then
+            find engine/obj-aarch64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type d -not -name 'dist' -exec rm -rf {} \;
+            find engine/obj-aarch64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \;
+          else
             find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type d -not -name 'dist' -exec rm -rf {} \;
             find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \;
+          fi
 
       - name: Upload dist object
         if: ${{ !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
-          name: windows-x64-obj-${{ matrix.generic == true && 'generic' || 'specific' }}
-          path: engine/obj-x86_64-pc-windows-msvc/
+          retention-days: 5
+          name: windows-x64-obj-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
+          path: engine/obj-${{ matrix.arch == 'aarch64' && 'aarch64' || 'x86_64' }}-pc-windows-msvc/
 
-      - name: Upload zip file if twilight branch
+      - name: Upload artifact (if Twilight branch, binary)
         if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
-          name: zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
-          path: ./zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
+          retention-days: 5
+          name: zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.zip
+          path: ./zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.zip
 
-      - name: Upload installer if twilight branch
+      - name: Upload artifact (if Twilight branch, installer)
         if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
-          name: zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
-          path: ./zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
+          retention-days: 5
+          name: zen.installer${{ matrix.arch == 'aarch64' && '-arm64' ||  '' }}.exe
+          path: ./zen.installer${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.exe
 
-      - name: Upload mar if twilight branch
+      - name: Upload artifact (if Twilight branch, .mar)
         if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
-          name: windows${{ matrix.generic == true && '-generic' || '' }}.mar
-          path: ./windows${{ matrix.generic == true && '-generic' || '' }}.mar
+          retention-days: 5
+          name: windows${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.mar
+          path: ./windows${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.mar
 
-      - name: Upload update manifests if twilight branch
+      - name: Upload artifact (if Twilight branch, update manifests)
         if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
         with:
-          name: windows_update_manifest_${{ matrix.generic == true && 'generic' || 'specific' }}
+          retention-days: 5
+          name: windows_update_manifest_${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
           path: ./dist/update

.gitignore

@@ -1,4 +1,3 @@
-
 .dotbuild/
 engine/
 firefox-*/
@@ -9,3 +8,4 @@ __pycache__/
 dist/
 
 windsign-temp/
+venv/

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "src/browser/base/content/zen-components"]
-	path = src/browser/base/content/zen-components
-	url = https://github.com/zen-browser/components
 [submodule "l10n"]
 	path = l10n
 	url = https://github.com/zen-browser/l10n-packs

.husky/pre-commit

@@ -1 +1 @@
-# npx lint-staged
+npx lint-staged

.nvmrc

@@ -0,0 +1 @@
+20

.prettierignore

@@ -3,10 +3,25 @@ engine/
 **/*.html
 **/*.xhtml
 **/*.inc.xhtml
+**/*.bundle.min.js
+**/*.min.js
+**/*.min.mjs
 
 **/*.svg
 
+surfer.json
+
 src/browser/app/profile/*.js
 pnpm-lock.yaml
 
 **/engine/
+
+docs/issue-metrics/*.md
+
+.husky/
+
+# Some CSS files are preprocessed and prettier doesn't handle them well
+# We also dont want to format the CSS files that are generated by the build
+src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+src/browser/base/zen-components/ZenEmojies.mjs
+build/codesign/codesign.bash

.prettierrc.json

@@ -8,5 +8,5 @@
   "jsxSingleQuote": false,
   "semi": true,
   "printWidth": 128,
-  "plugins": []
+  "plugins": ["prettier-plugin-sh"]
 }

.python-version

@@ -0,0 +1 @@
+3.11

AppDir/zen.desktop

@@ -5,7 +5,7 @@ Exec=zen %u
 Icon=zen
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
-StartupWMClass=zen-alpha
+StartupWMClass=zen
 Categories=Network;WebBrowser;
 StartupNotify=true
 Terminal=false

CODE_OF_CONDUCT.md

@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:
 
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
   and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
+- Focusing on what is best not just for us as individuals, but for the
   overall community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or
+- The use of sexualized language or imagery, and sexual attention or
   advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
   address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
+- Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
 ## Enforcement Responsibilities

README.md

@@ -1,10 +1,10 @@
-<img src="./docs/assets/zen-black.svg" width="100px" align="left">
+<img src="./docs/assets/zen-dark.svg" width="100px" align="left">
 
 ### `Zen Browser`
 
 [![Downloads](https://img.shields.io/github/downloads/zen-browser/desktop/total.svg)](https://github.com/zen-browser/desktop/releases)
 [![Crowdin](https://badges.crowdin.net/zen-browser/localized.svg)](https://crowdin.com/project/zen-browser)
-
+[![Zen Release builds](https://github.com/zen-browser/desktop/actions/workflows/build.yml/badge.svg?branch=stable)](https://github.com/zen-browser/desktop/actions/workflows/build.yml)
 
 ✨ Experience tranquillity while browsing the web without people tracking you! Zen is a privacy-focused browser that blocks trackers, ads, and other unwanted content while offering the best browsing experience!
 
@@ -21,15 +21,16 @@
     Documentation
   </a>
   •
-  <a href="https//zen-browser.app/release-notes/latest">
+  <a href="https://zen-browser.app/release-notes/latest">
     Release Notes
   </a>
 </div>
 
 ## 🖥️ Compatibility
 
-Zen is currently built using firefox version `131.0.3`! 🚀
+Zen is currently built using firefox version `134.0.1`! 🚀
 
+- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using firefox version `RC 134.0.1`!
 - Check out the latest [release notes](https://zen-browser.app/release-notes)!
 - Part of our mission is to keep Zen up-to-date with the latest version of Firefox, so you can enjoy the latest features and security updates!
 
@@ -37,6 +38,25 @@ Zen is currently built using firefox version `131.0.3`! 🚀
 
 Zen is an open-source project, and we welcome contributions from the community! Please take a look at the [contribution guidelines](./docs/contribute.md) before getting started!
 
+### Issue metrics
+
+We keep track of how many issues are closed at the end of the month in [docs/issue-metrics](./docs/issue-metrics). This is to keep track of how many issues are being closed, because who doesn't like to see progress? 📈
+
+### Versioning
+
+Zen uses [Semantic Versioning](https://semver.org/) for versioning. Meaning, versions are displayed as `a.bc.d` where:
+
+- `a` is the major version
+- `b` is the minor version
+- `c` is the branch prefix
+- `d` is the patch version
+
+### Branches
+
+Zen is divided into 2 main branches. We use `dev` for development and `stable` for stable releases. The `dev` branch is where all the new features are added and where `twilight` builds are generated. The `stable` branch is where the stable releases are generated.
+
+We divide into 2 branches in case there's any really important security update (for example) that needs to be released before the next stable release. This allows us to do patches without releasing unstable versions to the public.
+
 ## ⚡ Performance
 
 Zen is built with performance in mind, and we have optimized the browser to be as fast as possible! Checkout the latest [performance benchmarks](https://docs.zen-browser.app/benchmarks)!
@@ -54,11 +74,7 @@ If you dont see your OS listed below, that's because we already have it in our [
 ##### Winget
 
 ```ps
-# Generic version
 winget install --id Zen-Team.Zen-Browser
-
-# Optimized version
-winget install --id Zen-Team.Zen-Browser.Optimized
 ```
 
 #### macOS
@@ -77,28 +93,27 @@ brew install --cask zen-browser
 ##### Arch-based distributions
 
 ```sh
-# For generic version
 yay -S zen-browser-bin
-
-# For optimized version
-yay -S zen-browser-avx2-bin
 ```
 
 ##### Other Linux distributions (AppImage with automated system integration)
 
+- `native` tarball install:
+  `bash <(curl -s https://updates.zen-browser.app/install.sh)`
+
 - `zsync` is required for the Update feature of the script below
 
 ```sh
 bash <(curl https://updates.zen-browser.app/appimage.sh)
 ```
 
-* Again, if you don't see your OS listed above, that's because we already have it in our [downloads page](https://zen-browser.app/download)! 🔄
+- Again, if you don't see your OS listed above, that's because we already have it in our [downloads page](https://zen-browser.app/download)! 🔄
 
 To upgrade the browser to a newer version, use the embedded update functionality in `About Zen`.
 
 ## 👨‍💻 Development and Contributing
 
-Some components used by @zen-browser as an attempt to make firefox forks a better place, and for other to enjoy the beauty of OSS. You can find them [here](https://github.com/zen-browser/components).
+Some components used by @zen-browser as an attempt to make firefox forks a better place, and for other to enjoy the beauty of OSS. You can find them [here](https://github.com/zen-browser/desktop/tree/dev/src/browser/base/zen-components).
 
 #### `Run Locally`
 
@@ -117,15 +132,9 @@ Zen couldn't be in its current state without the help of these amazing projects!
 
 ### 🖥️ Comparison with other browsers
 
-As you can see, chromium based browsers are the most popular browsers, help us change that by starring the project and spreading the word! 🌟
+Thanks everyone for making zen stand out among these giants!
 
-<a href="https://star-history.com/#zen-browser/desktop&Date">
- <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=zen-browser/desktop,chromium/chromium,brave/brave-browser&type=Date&theme=dark" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=zen-browser/desktop,chromium/chromium,brave/brave-browser&type=Date" />
-   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=chromium/chromium,zen-browser/desktop,brave/brave-browser&type=Date" />
- </picture>
-</a>
+[![Star History Chart](https://api.star-history.com/svg?repos=zen-browser/desktop,chromium/chromium,brave/brave-browser&type=Date)](https://star-history.com/#zen-browser/desktop&chromium/chromium&brave/brave-browser&Date)
 
 ## 📄 License
 

build/codesign/browser.developer.entitlements.xml

@@ -28,5 +28,12 @@
          for native messaging webextension helper applications launched by
          Firefox which rely on Apple Events to signal other processes. -->
     <key>com.apple.security.automation.apple-events</key><true/>
+
+    <!-- For SmartCardServices(7) -->
+    <key>com.apple.security.smartcard</key><true/>
+
+    <!-- Required for com.apple.developer.web-browser.public-key-credential -->
+    <key>com.apple.application-identifier</key>
+    <string>H36NPCN86W.app.zen-browser.zen</string>
   </dict>
 </plist>

build/codesign/codesign.bash

@@ -111,6 +111,9 @@ echo "-------------------------------------------------------------------------"
 
 set -x
 
+# move Zen_Browser.provisionprofile to the Contents directory
+#cp Zen_Browser.provisionprofile "${BUNDLE}"/Contents/embedded.provisionprofile
+
 # Clear extended attributes which cause codesign to fail
 xattr -cr "${BUNDLE}"
 
@@ -119,8 +122,15 @@ xattr -cr "${BUNDLE}"
 codesign --force -o runtime --verbose --sign "$IDENTITY" \
 "${BUNDLE}/Contents/Library/LaunchServices/org.mozilla.updater" \
 "${BUNDLE}/Contents/MacOS/XUL" \
-"${BUNDLE}/Contents/MacOS/pingsender" \
-"${BUNDLE}/Contents/MacOS/*.dylib" \
+"${BUNDLE}"/Contents/embedded.provisionprofile \
+"${BUNDLE}/Contents/MacOS/pingsender"
+
+# Sign every ${BUNDLE}/Contents/MacOS/*.dylib
+find "${BUNDLE}"/Contents/MacOS -type f -name "*.dylib" -exec \
+codesign --force --verbose --sign "$IDENTITY" {} \;
+
+find "${BUNDLE}"/Contents/MacOS -type f -name "*.dylib" -exec \
+codesign -vvv --strict --deep --verbose {} \;
 
 codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
 "${BUNDLE}"/Contents/MacOS/updater.app

build/winsign/sign.ps1

@@ -1,127 +1,119 @@
 param(
+    [ValidateNotNullOrEmpty()]
     [string][Parameter(Mandatory=$true)]$SignIdentity,
+    
+    [ValidateNotNullOrEmpty()]
     [string][Parameter(Mandatory=$true)]$GithubRunId
 )
 
 $ErrorActionPreference = "Stop"
 
-echo "Preparing environment"
-git pull --recurse-submodules
-mkdir windsign-temp -ErrorAction SilentlyContinue
-
-# Download in parallel
-
-#show output too
-Start-Job -Name "DownloadGitObjectsRepo" -ScriptBlock {
-    param($PWD)
-    echo "Downloading git objects repo to $PWD\windsign-temp\windows-binaries"
-    git clone https://github.com/zen-browser/windows-binaries.git $PWD\windsign-temp\windows-binaries
-    echo "Downloaded git objects repo to"
-} -Verbose -ArgumentList $PWD -Debug
-
-gh run download $GithubRunId --name windows-x64-obj-specific -D windsign-temp\windows-x64-obj-specific
-echo "Downloaded specific artifacts"
-gh run download $GithubRunId --name windows-x64-obj-generic -D windsign-temp\windows-x64-obj-generic
-echo "Downloaded generic artifacts"
-
-Wait-Job -Name "DownloadGitObjectsRepo"
-
-mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
-
-pnpm surfer ci --brand alpha
-
-function SignAndPackage($name) {
-    echo "Executing on $name"
-    rmdir .\dist -Recurse -ErrorAction SilentlyContinue
-    rmdir engine\obj-x86_64-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
-    cp windsign-temp\windows-x64-obj-$name engine\obj-x86_64-pc-windows-msvc\ -Recurse
-    echo "Signing $name"
-
-    # Collect all .exe and .dll files into a list
-    $files = Get-ChildItem engine\obj-x86_64-pc-windows-msvc\ -Recurse -Include *.exe
-    $files += Get-ChildItem engine\obj-x86_64-pc-windows-msvc\ -Recurse -Include *.dll
-
-    signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
-    echo "Packaging $name"
-    $env:SURFER_SIGNING_MODE="sign"
-    $env:MAR="$PWD\\build\\winsign\\mar.exe"
-    if ($name -eq "generic") {
-        $env:SURFER_COMPAT="true"
-    } else {
-        rm env:SURFER_COMPAT -ErrorAction SilentlyContinue
+function Download-Artifacts {
+    param(
+        [string]$Name,
+        [string]$GithubRunId
+    )
+    gh run download $GithubRunId --name $Name -D (Join-Path $PWD 'windsign-temp\windows-x64-obj-' + $Name)
+    Write-Verbose "Downloaded $Name artifacts"
 }
 
-    echo "Compat Mode? $env:SURFER_COMPAT"
+function Sign-Files {
+    param(
+        [string]$Path
+    )
+    $files = Get-ChildItem -Path $Path -Recurse -Include *.exe, *.dll
+    signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
+}
+
+function Move-File {
+    param(
+        [string]$Source,
+        [string]$Destination
+    )
+    if (Test-Path $Source) {
+        Move-Item $Source -Destination $Destination -Force
+        Write-Verbose "Moved $Source to $Destination"
+    } else {
+        Write-Warning "Source file $Source does not exist."
+    }
+}
+
+function Create-Tar {
+    param(
+        [string]$Name
+    )
+    $tarPath = Join-Path $PWD "windsign-temp\windows-x64-signed-$Name"
+    Remove-Item -Path $tarPath -Recurse -ErrorAction SilentlyContinue
+    New-Item -ItemType Directory -Path $tarPath | Out-Null
+
+    Move-File -Source ".\dist\output.mar" -Destination (Join-Path $tarPath ("windows-$Name.mar"))
+    Move-File -Source ".\dist\zen.installer.exe" -Destination (Join-Path $tarPath ("zen.installer$($Name -eq 'arm64' ? '-arm64' : '') .exe"))
+    Move-File -Source (Get-ChildItem ".\dist\*.en-US.win64$($Name -eq 'arm64' ? '-aarch64' : '') .zip" | Select-Object -First 1) -Destination (Join-Path $tarPath ("zen.win-$Name.zip"))
+}
+
+function SignAndPackage {
+    param(
+        [string]$Name
+    )
+
+    Write-Verbose "Executing on $Name"
+    Remove-Item -Path ".\dist" -Recurse -ErrorAction SilentlyContinue
+    Remove-Item -Path "engine\obj-x86_64-pc-windows-msvc\" -Recurse -ErrorAction SilentlyContinue
+    Copy-Item -Path (Join-Path $PWD "windsign-temp\windows-x64-obj-$Name") -Destination "engine\obj-x86_64-pc-windows-msvc\" -Recurse
+    Write-Verbose "Signing $Name"
+
+    Sign-Files -Path "engine\obj-x86_64-pc-windows-msvc\"
+
+    $env:SURFER_SIGNING_MODE = "sign"
+    $env:MAR = (Join-Path $PWD "build\winsign\mar.exe")
+    $env:SURFER_COMPAT = if ($Name -eq "arm64") { "aarch64" } else { "x86_64" }
+    Write-Verbose "Compat Mode? $env:SURFER_COMPAT"
+
     pnpm surfer package --verbose
 
-    # In the release script, we do the following:
-    #  tar -xvf .github/workflows/object/windows-x64-signed-generic.tar.gz -C windows-x64-signed-generic
-    # We need to create a tar with the same structure and no top-level directory
-    # Inside, we need:
-    #  - update_manifest/*
-    #  - windows.mar or windows-generic.mar
-    #  - zen.installer.exe or zen.installer-generic.exe
-    #  - zen.win-generic.zip or zen.win-specific.zip
-    echo "Creating tar for $name"
-    rm .\windsign-temp\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
-    mkdir windsign-temp\windows-x64-signed-$name
+    Create-Tar -Name $Name
 
-    # Move the MAR, add the `-generic` suffix if needed
-    if ($name -eq "generic") {
-        mv .\dist\output.mar windsign-temp\windows-x64-signed-$name\windows-generic.mar
-    } else {
-        mv .\dist\output.mar windsign-temp\windows-x64-signed-$name\windows.mar
+    # Extract and sign the contents of the zip
+    Expand-Archive -Path (Join-Path $tarPath ("zen.win-$Name.zip")) -DestinationPath (Join-Path $tarPath ("zen.win-$Name"))
+    Remove-Item -Path (Join-Path $tarPath ("zen.win-$Name.zip")) -ErrorAction SilentlyContinue
+
+    Sign-Files -Path (Join-Path $tarPath ("zen.win-$Name"))
+    Compress-Archive -Path (Join-Path $tarPath ("zen.win-$Name")) -DestinationPath (Join-Path $tarPath ("zen.win-$Name.zip"))
+    Remove-Item -Path (Join-Path $tarPath ("zen.win-$Name")) -Recurse -ErrorAction SilentlyContinue
+
+    Move-File -Source ".\dist\update\*" -Destination (Join-Path $tarPath "update_manifest")
+
+    Write-Verbose "Finished $Name"
 }
 
-    # Move the installer
-    if ($name -eq "generic") {
-        mv .\dist\zen.installer.exe windsign-temp\windows-x64-signed-$name\zen.installer-generic.exe
-    } else {
-        mv .\dist\zen.installer.exe windsign-temp\windows-x64-signed-$name\zen.installer.exe
-    }
+Write-Verbose "Preparing environment"
+git pull --recurse-submodules
+New-Item -ItemType Directory -Path "windsign-temp" -ErrorAction SilentlyContinue
 
-    # Move the zip
-    mv (Get-Item .\dist\*.en-US.win64.zip) windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
+Download-Artifacts -Name "windows-x64-obj-arm64" -GithubRunId $GithubRunId
+Download-Artifacts -Name "windows-x64-obj-x86_64" -GithubRunId $GithubRunId
 
-    # Extract the zip, sign everything inside, and repackage it
-    Expand-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name.zip -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$name
-    rm windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
-    $files = Get-ChildItem windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -Include *.exe
-    $files += Get-ChildItem windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -Include *.dll
-    signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
-    Compress-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
-    rmdir windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -ErrorAction SilentlyContinue
+New-Item -ItemType Directory -Path "engine\obj-x86_64-pc-windows-msvc" -ErrorAction SilentlyContinue
+pnpm surfer ci --brand release
 
-    # Move the manifest
-    mv .\dist\update\. windsign-temp\windows-x64-signed-$name\update_manifest
+SignAndPackage -Name "arm64"
+SignAndPackage -Name "x86_64"
 
-    echo "Invoking tar for $name"
-    # note: We need to sign it into a parent folder, called windows-x64-signed-$name
-    rmdir .\windsign-temp\windows-binaries\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
-    mv windsign-temp\windows-x64-signed-$name .\windsign-temp\windows-binaries -Force
-
-    echo "Finished $name"
-}
-
-SignAndPackage specific
-SignAndPackage generic
-
-echo "All artifacts signed and packaged, ready for release!"
-echo "Commiting the changes to the repository"
-cd windsign-temp\windows-binaries
+Write-Verbose "All artifacts signed and packaged, ready for release!"
+Write-Verbose "Committing the changes to the repository"
+cd (Join-Path $PWD "windsign-temp\windows-binaries")
 git add .
 git commit -m "Sign and package windows artifacts"
 git push
-cd ..\..
+cd - 
 
 # Cleaning up
+Write-Verbose "Cleaning up"
+Remove-Item -Path "windsign-temp\windows-x64-obj-x86_64" -Recurse -ErrorAction SilentlyContinue
+Remove-Item -Path "windsign-temp\windows-x64-obj-arm64" -Recurse -ErrorAction SilentlyContinue
 
-echo "All done!"
-echo "All the artifacts (Generic and Specific) are signed and packaged, get a rest now!"
-Read-Host "Press Enter to continue"
-
-echo "Cleaning up" 
-rmdir windsign-temp -Recurse -ErrorAction SilentlyContinue
-
-echo "Opening visual studio code"
+Write-Verbose "Opening Visual Studio Code"
 code .
+Write-Host "All done! Press Enter to continue."
+Read-Host
+

configs/branding/alpha/content/about-logo-private.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.g{fill:#000;}.g,.h,.i{stroke-width:0px;}.h{fill:url(#e);}.i{fill:#fff;}</style><linearGradient id="e" x1="128" y1="256" x2="128" y2="0" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#fff" stop-opacity=".02"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><g id="c"><rect class="g" y="0" width="256" height="256" rx="58.4" ry="58.4"/></g><g id="d"><rect class="h" y="0" width="256" height="256" rx="58.4" ry="58.4"/></g><g id="f"><path class="i" d="M165.9156,146.3156c-15.6016,0-28.6656,11.0055-31.8813,25.6562h-12.0687c-3.2156-14.6508-16.2797-25.6562-31.8813-25.6562-18.0063,0-32.6562,14.65-32.6562,32.6562s14.65,32.6562,32.6562,32.6562c15.6016,0,28.6656-11.0055,31.8813-25.6562h12.0687c3.2156,14.6508,16.2797,25.6562,31.8813,25.6562,18.0063,0,32.6562-14.65,32.6562-32.6562s-14.65-32.6562-32.6562-32.6562ZM90.0844,197.6281c-10.2875,0-18.6562-8.3687-18.6562-18.6562s8.3687-18.6562,18.6562-18.6562,18.6562,8.3688,18.6562,18.6562-8.3687,18.6562-18.6562,18.6562ZM165.9156,197.6281c-10.2875,0-18.6562-8.3687-18.6562-18.6562s8.3687-18.6562,18.6562-18.6562,18.6562,8.3688,18.6562,18.6562-8.3687,18.6562-18.6562,18.6562Z"/><path class="i" d="M214.4,115.6812h-21.8391l-9.2422-65.2906c-.3031-2.1406-1.5813-4.0219-3.4594-5.0969-1.8781-1.0719-4.1469-1.2188-6.1469-.3906l-45.7125,18.8906-45.7125-18.8906c-2-.8281-4.2688-.6813-6.1469.3906-1.8781,1.075-3.1562,2.9562-3.4594,5.0969l-9.2422,65.2906h-21.8391c-3.8656,0-7,3.1344-7,7s3.1344,7,7,7h172.8c3.8656,0,7-3.1344,7-7s-3.1344-7-7-7ZM85.2781,61.2875l40.0469,16.55c1.7125.7063,3.6375.7063,5.35,0l40.0469-16.55,7.6984,54.3937h-100.8406l7.6984-54.3937Z"/></g></svg>

configs/branding/alpha/content/about-logo.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 80 80"><defs><style>.g{fill:#000;}.g,.h,.i{stroke-width:0px;}.h{fill:url(#e);}.i{fill:#fef9fe;}</style><linearGradient id="e" x1="40" y1="80" x2="40" y2="0" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#fff" stop-opacity=".02"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><g id="c"><rect class="g" width="80" height="80" rx="18.25" ry="18.25"/></g><g id="d"><rect class="h" width="80" height="80" rx="18.25" ry="18.25"/></g><g id="f"><path class="i" d="M63.4352,57.677c-.0536,3.2125-2.7416,5.7589-5.9546,5.7589h-22.0762c-1.1221,0-1.8295-1.2103-1.2751-2.1859,1.4628-2.5738,4.3202-6.7829,8.5529-9.1539.4406-.2468.9366-.3783,1.4416-.3783h13.4532c3.2692,0,5.9129,2.6774,5.8582,5.9591Z"/><path class="i" d="M45.8707,18.7498c-1.4628,2.5738-4.3202,6.7829-8.5529,9.1539-.4406.2468-.9366.3783-1.4416.3783h-13.3567c-3.213,0-5.901-2.5464-5.9546-5.7589-.0547-3.2817,2.589-5.9591,5.8582-5.9591h22.1726c1.1221,0,1.8295,1.2103,1.2751,2.1859Z"/><path class="i" d="M22.4207,63.4375c-.7473,0-1.5065-.1438-2.2398-.4475-2.9896-1.2383-4.4093-4.6657-3.171-7.6551,1.9045-4.5977,4.6342-8.7196,8.1136-12.2511,3.6044-3.6585,7.8551-6.5172,12.6343-8.4968,6.5691-2.7211,11.6853-7.8373,14.4061-14.4061,1.2383-2.9896,4.6658-4.409,7.6551-3.171,2.9896,1.2383,4.4093,4.6657,3.171,7.6551-1.9045,4.5977-4.6342,8.7196-8.1136,12.2511-3.6044,3.6585-7.8551,6.5172-12.6343,8.4968-6.5691,2.7211-11.6853,7.8373-14.4061,14.4061-.9345,2.2562-3.1164,3.6185-5.4153,3.6185Z"/></g></svg>

configs/branding/release/content/about-logo-private.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.h{filter:url(#f);}.i{fill:#202020;}.j{fill:#f2f0e3;}</style><filter id="f" x="-.4" y="1.68" width="256.8" height="256.8" filterUnits="userSpaceOnUse"><feOffset dx="0" dy="2"/><feGaussianBlur result="g" stdDeviation="2"/><feFlood flood-color="#000" flood-opacity=".5"/><feComposite in2="g" operator="in"/><feComposite in="SourceGraphic"/></filter></defs><g class="h"><rect class="i" x="5.75" y="5.7717" width="244.5" height="244.5" rx="46" ry="46"/></g><path class="j" d="M165.9933,146.3748c-15.6335,0-28.7244,11.028-31.9466,25.7088h-12.0935c-3.2222-14.6808-16.313-25.7088-31.9466-25.7088-18.0431,0-32.7232,14.68-32.7232,32.7232s14.68,32.7232,32.7232,32.7232c15.6335,0,28.7244-11.028,31.9466-25.7088h12.0935c3.2222,14.6808,16.313,25.7088,31.9466,25.7088,18.0431,0,32.7232-14.68,32.7232-32.7232s-14.68-32.7232-32.7232-32.7232ZM90.0067,197.7925c-10.3086,0-18.6945-8.3859-18.6945-18.6945s8.3859-18.6945,18.6945-18.6945,18.6945,8.3859,18.6945,18.6945-8.3859,18.6945-18.6945,18.6945ZM165.9933,197.7925c-10.3086,0-18.6945-8.3859-18.6945-18.6945s8.3859-18.6945,18.6945-18.6945,18.6945,8.3859,18.6945,18.6945-8.3859,18.6945-18.6945,18.6945Z"/><path class="j" d="M214.577,115.6777h-21.8838l-9.2611-65.4244c-.3037-2.145-1.5845-4.0301-3.4665-5.1073-1.882-1.0741-4.1554-1.2212-6.1595-.3914l-45.8062,18.9293-45.8062-18.9293c-2.0041-.8298-4.2775-.6826-6.1595.3914-1.882,1.0772-3.1627,2.9623-3.4665,5.1073l-9.2611,65.4244h-21.8838c-3.8735,0-7.0143,3.1408-7.0143,7.0143s3.1408,7.0143,7.0143,7.0143h173.1541c3.8735,0,7.0143-3.1408,7.0143-7.0143s-3.1408-7.0143-7.0143-7.0143ZM85.1906,61.1725l40.1289,16.5839c1.716.7077,3.645.7077,5.361,0l40.1289-16.5839,7.7142,54.5052h-101.0473l7.7142-54.5052Z"/></svg>

configs/branding/release/content/about-logo.svg

@@ -0,0 +1,12 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_109_1042)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512 627.385C575.725 627.385 627.385 575.725 627.385 512C627.385 448.275 575.725 396.615 512 396.615C448.275 396.615 396.615 448.275 396.615 512C396.615 575.725 448.275 627.385 512 627.385ZM604.308 512C604.308 562.98 562.98 604.308 512 604.308C461.02 604.308 419.692 562.98 419.692 512C419.692 461.02 461.02 419.692 512 419.692C562.98 419.692 604.308 461.02 604.308 512Z" fill="#F76F53"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M712 512C712 622.457 622.457 712 512 712C401.543 712 312 622.457 312 512C312 401.543 401.543 312 512 312C622.457 312 712 401.543 712 512ZM512 673.538C601.215 673.538 673.538 601.215 673.538 512C673.538 422.785 601.215 350.462 512 350.462C422.785 350.462 350.462 422.785 350.462 512C350.462 601.215 422.785 673.538 512 673.538Z" fill="#F76F53"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M812 512C812 677.685 677.685 812 512 812C346.315 812 212 677.685 212 512C212 346.315 346.315 212 512 212C677.685 212 812 346.315 812 512ZM512 758.154C647.947 758.154 758.154 647.947 758.154 512C758.154 376.053 647.947 265.846 512 265.846C376.053 265.846 265.846 376.053 265.846 512C265.846 647.947 376.053 758.154 512 758.154Z" fill="#F76F53"/>
+</g>
+<defs>
+<clipPath id="clip0_109_1042">
+<rect width="1024" height="1024" fill="white"/>
+</clipPath>
+</defs>
+</svg>

configs/branding/twilight/content/about-logo-private.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.g{fill:#000;}.g,.h,.i{stroke-width:0px;}.h{fill:url(#e);}.i{fill:#fff;}</style><linearGradient id="e" x1="128" y1="256" x2="128" y2="0" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#fff" stop-opacity=".02"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><g id="c"><rect class="g" y="0" width="256" height="256" rx="58.4" ry="58.4"/></g><g id="d"><rect class="h" y="0" width="256" height="256" rx="58.4" ry="58.4"/></g><g id="f"><path class="i" d="M165.9156,146.3156c-15.6016,0-28.6656,11.0055-31.8813,25.6562h-12.0687c-3.2156-14.6508-16.2797-25.6562-31.8813-25.6562-18.0063,0-32.6562,14.65-32.6562,32.6562s14.65,32.6562,32.6562,32.6562c15.6016,0,28.6656-11.0055,31.8813-25.6562h12.0687c3.2156,14.6508,16.2797,25.6562,31.8813,25.6562,18.0063,0,32.6562-14.65,32.6562-32.6562s-14.65-32.6562-32.6562-32.6562ZM90.0844,197.6281c-10.2875,0-18.6562-8.3687-18.6562-18.6562s8.3687-18.6562,18.6562-18.6562,18.6562,8.3688,18.6562,18.6562-8.3687,18.6562-18.6562,18.6562ZM165.9156,197.6281c-10.2875,0-18.6562-8.3687-18.6562-18.6562s8.3687-18.6562,18.6562-18.6562,18.6562,8.3688,18.6562,18.6562-8.3687,18.6562-18.6562,18.6562Z"/><path class="i" d="M214.4,115.6812h-21.8391l-9.2422-65.2906c-.3031-2.1406-1.5813-4.0219-3.4594-5.0969-1.8781-1.0719-4.1469-1.2188-6.1469-.3906l-45.7125,18.8906-45.7125-18.8906c-2-.8281-4.2688-.6813-6.1469.3906-1.8781,1.075-3.1562,2.9562-3.4594,5.0969l-9.2422,65.2906h-21.8391c-3.8656,0-7,3.1344-7,7s3.1344,7,7,7h172.8c3.8656,0,7-3.1344,7-7s-3.1344-7-7-7ZM85.2781,61.2875l40.0469,16.55c1.7125.7063,3.6375.7063,5.35,0l40.0469-16.55,7.6984,54.3937h-100.8406l7.6984-54.3937Z"/></g></svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.h{filter:url(#f);}.i{fill:#202020;}.j{fill:#f2f0e3;}</style><filter id="f" x="-.4" y="1.68" width="256.8" height="256.8" filterUnits="userSpaceOnUse"><feOffset dx="0" dy="2"/><feGaussianBlur result="g" stdDeviation="2"/><feFlood flood-color="#000" flood-opacity=".5"/><feComposite in2="g" operator="in"/><feComposite in="SourceGraphic"/></filter></defs><g class="h"><rect class="i" x="5.75" y="5.7717" width="244.5" height="244.5" rx="46" ry="46"/></g><path class="j" d="M165.9933,146.3748c-15.6335,0-28.7244,11.028-31.9466,25.7088h-12.0935c-3.2222-14.6808-16.313-25.7088-31.9466-25.7088-18.0431,0-32.7232,14.68-32.7232,32.7232s14.68,32.7232,32.7232,32.7232c15.6335,0,28.7244-11.028,31.9466-25.7088h12.0935c3.2222,14.6808,16.313,25.7088,31.9466,25.7088,18.0431,0,32.7232-14.68,32.7232-32.7232s-14.68-32.7232-32.7232-32.7232ZM90.0067,197.7925c-10.3086,0-18.6945-8.3859-18.6945-18.6945s8.3859-18.6945,18.6945-18.6945,18.6945,8.3859,18.6945,18.6945-8.3859,18.6945-18.6945,18.6945ZM165.9933,197.7925c-10.3086,0-18.6945-8.3859-18.6945-18.6945s8.3859-18.6945,18.6945-18.6945,18.6945,8.3859,18.6945,18.6945-8.3859,18.6945-18.6945,18.6945Z"/><path class="j" d="M214.577,115.6777h-21.8838l-9.2611-65.4244c-.3037-2.145-1.5845-4.0301-3.4665-5.1073-1.882-1.0741-4.1554-1.2212-6.1595-.3914l-45.8062,18.9293-45.8062-18.9293c-2.0041-.8298-4.2775-.6826-6.1595.3914-1.882,1.0772-3.1627,2.9623-3.4665,5.1073l-9.2611,65.4244h-21.8838c-3.8735,0-7.0143,3.1408-7.0143,7.0143s3.1408,7.0143,7.0143,7.0143h173.1541c3.8735,0,7.0143-3.1408,7.0143-7.0143s-3.1408-7.0143-7.0143-7.0143ZM85.1906,61.1725l40.1289,16.5839c1.716.7077,3.645.7077,5.361,0l40.1289-16.5839,7.7142,54.5052h-101.0473l7.7142-54.5052Z"/></svg>

configs/branding/twilight/content/about-logo.svg

@@ -1 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 80 80"><defs><style>.g{fill:url(#e);}.g,.h,.i{stroke-width:0px;}.h{fill:#a570ff;}.i{fill:#fef9fe;}</style><linearGradient id="e" x1="40" y1="80" x2="40" y2="0" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#fff" stop-opacity="0"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><g id="c"><rect class="h" width="80" height="80" rx="18.25" ry="18.25"/></g><g id="d"><rect class="g" width="80" height="80" rx="18.25" ry="18.25"/></g><g id="f"><path class="i" d="M63.4352,57.677c-.0536,3.2125-2.7416,5.7589-5.9546,5.7589h-22.0762c-1.1221,0-1.8295-1.2103-1.2751-2.1859,1.4628-2.5738,4.3202-6.7829,8.5529-9.1539.4406-.2468.9366-.3783,1.4416-.3783h13.4532c3.2692,0,5.9129,2.6774,5.8582,5.9591Z"/><path class="i" d="M45.8707,18.7498c-1.4628,2.5738-4.3202,6.7829-8.5529,9.1539-.4406.2468-.9366.3783-1.4416.3783h-13.3567c-3.213,0-5.901-2.5464-5.9546-5.7589-.0547-3.2817,2.589-5.9591,5.8582-5.9591h22.1726c1.1221,0,1.8295,1.2103,1.2751,2.1859Z"/><path class="i" d="M22.4207,63.4375c-.7473,0-1.5065-.1438-2.2398-.4475-2.9896-1.2383-4.4093-4.6657-3.171-7.6551,1.9045-4.5977,4.6342-8.7196,8.1136-12.2511,3.6044-3.6585,7.8551-6.5172,12.6343-8.4968,6.5691-2.7211,11.6853-7.8373,14.4061-14.4061,1.2383-2.9896,4.6658-4.409,7.6551-3.171,2.9896,1.2383,4.4093,4.6657,3.171,7.6551-1.9045,4.5977-4.6342,8.7196-8.1136,12.2511-3.6044,3.6585-7.8551,6.5172-12.6343,8.4968-6.5691,2.7211-11.6853,7.8373-14.4061,14.4061-.9345,2.2562-3.1164,3.6185-5.4153,3.6185Z"/></g></svg>
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_109_1042)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512 627.385C575.725 627.385 627.385 575.725 627.385 512C627.385 448.275 575.725 396.615 512 396.615C448.275 396.615 396.615 448.275 396.615 512C396.615 575.725 448.275 627.385 512 627.385ZM604.308 512C604.308 562.98 562.98 604.308 512 604.308C461.02 604.308 419.692 562.98 419.692 512C419.692 461.02 461.02 419.692 512 419.692C562.98 419.692 604.308 461.02 604.308 512Z" fill="#F76F53"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M712 512C712 622.457 622.457 712 512 712C401.543 712 312 622.457 312 512C312 401.543 401.543 312 512 312C622.457 312 712 401.543 712 512ZM512 673.538C601.215 673.538 673.538 601.215 673.538 512C673.538 422.785 601.215 350.462 512 350.462C422.785 350.462 350.462 422.785 350.462 512C350.462 601.215 422.785 673.538 512 673.538Z" fill="#F76F53"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M812 512C812 677.685 677.685 812 512 812C346.315 812 212 677.685 212 512C212 346.315 346.315 212 512 212C677.685 212 812 346.315 812 512ZM512 758.154C647.947 758.154 758.154 647.947 758.154 512C758.154 376.053 647.947 265.846 512 265.846C376.053 265.846 265.846 376.053 265.846 512C265.846 647.947 376.053 758.154 512 758.154Z" fill="#F76F53"/>
+</g>
+<defs>
+<clipPath id="clip0_109_1042">
+<rect width="1024" height="1024" fill="white"/>
+</clipPath>
+</defs>
+</svg>