mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-04-02 13:49:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into macos-security-key-fix

Browse Source
This commit is contained in:
mr. m
2025-02-08 10:09:19 +01:00
committed by GitHub
parent 9c11e19db8 06a03cd4ca
commit 2898dc497a
202 changed files with 4038 additions and 3723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
.github/workflows/build.yml vendored
View File

@@ -142,18 +142,9 @@ jobs:
with:
node-version-file: '.nvmrc'
- name: Setup pnpm
run: npm install -g pnpm
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- name: Install dependencies
run: |
pnpm install
npm install
- name: Setup Surfer
run: |
@@ -162,12 +153,12 @@ jobs:
- name: Bump version
if: ${{ inputs.update_version && inputs.update_branch == 'release' }}
run: |
pnpm surfer ci --brand ${{ inputs.update_branch }} --bump prerelease
npm run surfer -- ci --brand ${{ inputs.update_branch }} --bump prerelease
- name: Bump version without new version
if: ${{ !inputs.update_version || inputs.update_branch == 'twilight' }}
run: |
pnpm surfer ci --brand ${{ inputs.update_branch }}
npm run surfer -- ci --brand ${{ inputs.update_branch }}
- name: Debug
run: |
@@ -211,18 +202,9 @@ jobs:
with:
node-version-file: '.nvmrc'
- name: Setup pnpm
run: npm install -g pnpm
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- name: Install dependencies
run: |
pnpm install
npm install
- name: Setup Surfer
run: |
@@ -230,15 +212,14 @@ jobs:
- name: Activate Surfer CLI
run: |
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 }}
npm run surfer -- ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
- name: Check version
run: |
echo "$(pwd)"
ls .
echo "version=$(pnpm surfer get version | xargs)" >> $GITHUB_OUTPUT
if [[ $(pnpm surfer get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
echo $(npm run --silent surfer -- get version | xargs)
echo "version=$(npm run --silent surfer -- get version | xargs)" >> $GITHUB_OUTPUT
if [[ $(npm run --silent surfer -- get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
echo ">>> Version matches"
else
echo ">>> Version mismatch"
@@ -268,27 +249,18 @@ jobs:
git config --global user.email "mauro-balades@users.noreply.github.com"
git config --global user.name "mauro-balades"
- name: Setup pnpm
run: npm install -g pnpm
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- name: Install dependencies
run: |
pnpm install
npm install
- name: Load Surfer CI setup
run: pnpm surfer ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
run: npm run surfer -- ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
- name: Download Firefox source and dependencies
run: pnpm surfer download --verbose
run: npm run download --verbose
- name: Import
run: pnpm surfer import --verbose
run: npm run import -- --verbose
- name: Compress
run: |
@@ -400,14 +372,14 @@ jobs:
- name: Install dependencies
run: |
npm install -g pnpm
npm install
sudo apt-get update
sudo apt-get -y install libfuse2 desktop-file-utils appstream
- name: Download Linux build
uses: actions/download-artifact@v4
with:
name: zen.linux-${{ matrix.arch }}.tar.bz2
name: zen.linux-${{ matrix.arch }}.tar.xz
- name: Execute AppImage build
run: |
@@ -547,8 +519,8 @@ jobs:
with:
files: |
zen.source.tar.zst
zen.linux-x86_64.tar.bz2
zen.linux-aarch64.tar.bz2
zen.linux-x86_64.tar.xz
zen.linux-aarch64.tar.xz
zen-x86_64.AppImage
zen-x86_64.AppImage.zsync
zen-aarch64.AppImage
@@ -581,8 +553,8 @@ jobs:
title: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
files: |
zen.source.tar.zst
zen.linux-x86_64.tar.bz2
zen.linux-aarch64.tar.bz2
zen.linux-x86_64.tar.xz
zen.linux-aarch64.tar.xz
zen-x86_64.AppImage
zen-x86_64.AppImage.zsync
zen-aarch64.AppImage
@@ -674,12 +646,12 @@ jobs:
- name: Download Linux x86_64 build
uses: actions/download-artifact@v4
with:
name: zen.linux-x86_64.tar.bz2
name: zen.linux-x86_64.tar.xz
- name: Download Linux aarch64 build
uses: actions/download-artifact@v4
with:
name: zen.linux-aarch64.tar.bz2
name: zen.linux-aarch64.tar.xz
- name: Update repository
uses: actions/checkout@v4
@@ -701,8 +673,8 @@ jobs:
python3 ./zen-browser/scripts/prepare-flatpak-release.py \
--flatpak-archive archive.tar \
--version ${{ needs.build-data.outputs.version }} \
--linux-archive zen.linux-x86_64.tar.bz2 \
--linux-aarch64-archive zen.linux-aarch64.tar.bz2 \
--linux-archive zen.linux-x86_64.tar.xz \
--linux-aarch64-archive zen.linux-aarch64.tar.xz \
--output app.zen_browser.zen.yml \
--template-root ./zen-browser/flatpak
@@ -715,7 +687,7 @@ jobs:
run: |
rm -rf zen-browser
rm -rf archive.tar
rm -rf zen.linux-x86_64.tar.bz2
rm -rf zen.linux-x86_64.tar.xz
- name: Upload Flatpak manifest
uses: actions/upload-artifact@v4

7
.github/workflows/code-linter.yml vendored
View File

@@ -27,11 +27,8 @@ jobs:
- name: Setup autopep8
run: sudo apt install python3-autopep8
- name: Setup pnpm
run: npm install -g pnpm
- name: Install dependencies
run: pnpm install
run: npm install
- name: Lint
run: pnpm lint
run: npm run lint

25
.github/workflows/linux-release-build.yml vendored
View File

@@ -81,24 +81,15 @@ jobs:
path: /home/runner/.cache/sccache
key: ${{ runner.os }}-sccache
- name: Setup pnpm
run: npm install -g pnpm
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- name: Install dependencies
run: |
pnpm install
npm install
- name: Load Surfer CI setup
run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
- name: Download Firefox source and dependencies
run: pnpm surfer download
run: npm run download
- name: Fix Rust version
run: |
@@ -115,7 +106,7 @@ jobs:
- name: Import
env:
SURFER_COMPAT: ${{ matrix.arch }}
run: pnpm surfer import
run: npm run import
- name: Build language packs
run: sh scripts/download-language-packs.sh
@@ -146,19 +137,19 @@ jobs:
run: |
export SURFER_PLATFORM="linux"
export ZEN_RELEASE=1
pnpm package
npm run package
- name: Rename artifacts
run: |
mv dist/zen-*.tar.bz2 "zen.linux-${{ matrix.arch }}.tar.bz2"
mv dist/zen-*.tar.xz "zen.linux-${{ matrix.arch }}.tar.xz"
mv dist/output.mar linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
- name: Upload build artifact (binary)
uses: actions/upload-artifact@v4
with:
retention-days: 5
name: zen.linux-${{ matrix.arch }}.tar.bz2
path: ./zen.linux-${{ matrix.arch }}.tar.bz2
name: zen.linux-${{ matrix.arch }}.tar.xz
path: ./zen.linux-${{ matrix.arch }}.tar.xz
- name: Upload build artifact (.mar)
uses: actions/upload-artifact@v4

19
.github/workflows/macos-release-build.yml vendored
View File

@@ -81,24 +81,15 @@ jobs:
echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.zsh
source ~/.bash_profile
- name: Setup pnpm
run: npm install -g pnpm
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- name: Install dependencies
run: |
pnpm install
npm install
- name: Load surfer CI setup
run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
- name: Download Firefox source and dependencies
run: pnpm surfer download
run: npm run download
- name: Bootstrap
run: |
@@ -111,7 +102,7 @@ jobs:
- name: Import
env:
SURFER_COMPAT: ${{ matrix.arch }}
run: pnpm surfer import --verbose
run: npm run import -- --verbose
- name: Build language packs
run: sh scripts/download-language-packs.sh
@@ -134,7 +125,7 @@ jobs:
run: |
export SURFER_PLATFORM="darwin"
export ZEN_RELEASE=1
pnpm package
npm run package
- name: Rename artifacts
run: |

21
.github/workflows/macos-universal-release-build.yml vendored
View File

@@ -68,24 +68,15 @@ jobs:
echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.zsh
source ~/.bash_profile
- name: Setup pnpm
run: npm install -g pnpm
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- name: Install dependencies
run: |
pnpm install
npm install
- name: Load surfer CI setup
run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
- name: Download Firefox source and dependencies
run: pnpm surfer download
run: npm run download
- name: Bootstrap
run: |
@@ -96,13 +87,13 @@ jobs:
cd ..
- name: Import
run: pnpm surfer import
run: npm run import
- name: Populate mozconfig
env:
SURFER_MOZCONFIG_ONLY: true
run: |
pnpm build
npm run build
cd engine
./mach configure
@@ -252,7 +243,7 @@ jobs:
export MAR=$(pwd)/zen-macos-host-mar
chmod +x $MAR
echo "MAR=$MAR"
pnpm package --verbose
npm run package -- --verbose
mv ./dist/output.mar ./macos.mar
- name: Upload build artifact (.mar)

5
.github/workflows/pr-test.yml vendored
View File

@@ -19,14 +19,11 @@ jobs:
with:
node-version-file: '.nvmrc'
- name: Setup pnpm
run: npm install -g pnpm
- name: Install Surfer
run: npm i -g @zen-browser/surfer
- name: Install dependencies
run: pnpm install
run: npm install
- name: Download Firefox and dependencies
run: surfer download

4
.github/workflows/src/release-build.sh vendored
View File

@@ -17,12 +17,12 @@ if command -v Xvfb &> /dev/null; then
export DISPLAY=:2
fi
export ZEN_RELEASE=1
pnpm build
npm run build
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
npm run build
fi

9
.github/workflows/windows-profile-build.yml vendored
View File

@@ -41,14 +41,11 @@ jobs:
git config --global user.email "mauro-balades@users.noreply.github.com"
git config --global user.name "mauro-balades"
- name: Setup pnpm
run: npm install -g pnpm
- name: Install Surfer
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 }}
run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
- name: Download artifact
if: ${{ matrix.arch == 'x86_64' }}
@@ -74,13 +71,13 @@ jobs:
if: ${{ matrix.arch == 'x86_64' }}
run: |
git config --global core.safecrlf false
pnpm surfer download
npm run download
- name: Import patches
if: ${{ matrix.arch == 'x86_64' }}
env:
SURFER_NO_BRANDING_PATCH: true
run: pnpm surfer import
run: npm run import
- name: Generate
if: ${{ matrix.arch == 'x86_64' }}

18
.github/workflows/windows-release-build.yml vendored
View File

@@ -52,9 +52,6 @@ jobs:
with:
node-version-file: '.nvmrc'
- name: Setup pnpm
run: npm install -g pnpm
- name: Setup Git
run: |
git config --global user.email "mauro-balades@users.noreply.github.com"
@@ -62,16 +59,16 @@ jobs:
- name: Install dependencies
run: |
pnpm install
npm install
sudo apt-get update
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 --fix-missing
- name: Load Surfer CI setup
run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
- name: Download Firefox and dependencies
if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
run: pnpm surfer download
run: npm run download
- name: win-cross Cache
env:
@@ -152,9 +149,8 @@ jobs:
cd engine/
chmod -R +x "$(echo ~)/win-cross/vs2022" || true
cd ..
npm install -g pnpm
export SURFER_PLATFORM="win32"
pnpm surfer bootstrap
npm run bootstrap
cd engine/
ls ~/.mozbuild/clang/lib/clang/
echo "export LIB=\"$(cd ~/.mozbuild/clang/lib/clang/* && cd lib/windows && pwd)\"" >> ../configs/common/mozconfig
@@ -185,7 +181,7 @@ jobs:
if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
env:
SURFER_COMPAT: ${{ matrix.arch }}
run: pnpm surfer import --verbose
run: npm run import -- --verbose
- name: Build language packs
if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
@@ -235,8 +231,8 @@ jobs:
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${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
npm run package
mv ./dist/zen-$(npm run --silent surfer -- get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
ls ./dist
ls .