mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-05 19:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Update Xvfb installation in alpha-build.sh to only run if not cross-compiling

Browse Source
This commit is contained in:
Mauro Balades
2024-07-22 23:39:16 +02:00
parent 7355138f14
commit 93668396da
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/src/alpha-build.sh vendored
View File

@@ -13,9 +13,12 @@ ulimit -n 4096
# Check if xfvb is installed
if ! command -v Xvfb &> /dev/null
then
Xvfb :2 -screen 0 1024x768x24 &
export LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata
export DISPLAY=:2
if ! test "$ZEN_CROSS_COMPILING"
then
Xvfb :2 -screen 0 1024x768x24 &
export LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata
export DISPLAY=:2
fi
pnpm build
else
echo "Xvfb could not be found, running without it"

3
.github/workflows/src/windows_mozconfig vendored
View File

@@ -30,13 +30,14 @@ export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=x86-64"
ac_add_options --disable-maintenance-service
ac_add_options --disable-bits-download
ac_add_options --disable-profiling
if test "$ZEN_GA_GENERATE_PROFILE"; then
mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
ac_add_options --enable-profile-generate=cross
ac_add_options --without-wasm-sandboxed-libraries
ac_add_options --enable-proxy-bypass-protection
else
ac_add_options --disable-profiling
ac_add_options --enable-profile-use=cross
ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata
ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log

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

@@ -48,8 +48,8 @@ jobs:
echo $workspace_dir
echo "cd $workspace_dir" '' >> mozilla-build-run.sh
echo 'export PATH=/c/mozilla-build/msys2/usr/bin:$PATH' '' >> mozilla-build-run.sh
echo './mach --no-interactive bootstrap --application-choice browser' '' >> mozilla-build-run.sh
echo 'ls /c/Users/runneradmin/.mozbuild/clang/bin' '' >> mozilla-build-run.sh
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\mozilla-build-run.sh

2
package.json
View File

@@ -27,6 +27,6 @@
},
"homepage": "https://github.com/zen-browser/core#readme",
"dependencies": {
"@zen-browser/surfer": "^1.0.36"
"@zen-browser/surfer": "^1.0.37"
}
}

10
pnpm-lock.yaml generated
View File

@@ -9,8 +9,8 @@ importers:
.:
dependencies:
'@zen-browser/surfer':
specifier: ^1.0.36
version: 1.0.36
specifier: ^1.0.37
version: 1.0.37
packages:
@@ -109,8 +109,8 @@ packages:
'@types/node@17.0.45':
resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
'@zen-browser/surfer@1.0.36':
resolution: {integrity: sha512-bah8tDdBkD8cTh4GNoPgs4hFt5zfVSavcvvnivcYbbuvqMnPyuGie8RKCE8xqch0sNId1qexELoC9+fRdhL16w==}
'@zen-browser/surfer@1.0.37':
resolution: {integrity: sha512-HKWgjfRpNuykDN5tKGrBQkEqOvGUsVdDIYw2uI7pocrWw58hKQ5JFvhRrtwi5NuiypR6lZ1rxXlGYQHX44N6OQ==}
hasBin: true
ansi-regex@5.0.1:
@@ -786,7 +786,7 @@ snapshots:
'@types/node@17.0.45': {}
'@zen-browser/surfer@1.0.36':
'@zen-browser/surfer@1.0.37':
dependencies:
'@resvg/resvg-js': 1.4.0
async-icns: 1.0.2