Here we go!

This commit is contained in:
Mauro Balades
2024-08-01 14:15:43 +02:00
parent b17fb12715
commit 2927b58924
14 changed files with 167 additions and 155 deletions

View File

@@ -229,10 +229,13 @@ jobs:
build-version: ${{ needs.build-data.outputs.version }}
appimage:
name: AppImage build
name: AppImage build - Linux ${{ matrix.arch }}
permissions:
contents: write
runs-on: ubuntu-latest
strategy:
matrix:
arch: [x64, x32]
needs: [linux]
steps:
- name: Install Node.js
@@ -259,24 +262,26 @@ jobs:
cp configs/branding/alpha/logo128.png AppDir/usr/share/icons/hicolor/128x128/apps/zen.png
cp configs/branding/alpha/logo128.png AppDir/zen.png
APPIMAGE_TARGET=${{ matrix.arch == 'x64' && 'x86_64' || 'i686' }}
APPDIR=AppDir
tar -xvf *.tar.* && rm -rf *.tar.*
mv zen/* $APPDIR/
wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$APPIMAGE_TARGET.AppImage
chmod +x *.AppImage
chmod +x ./AppDir/AppRun
echo "AppDir: $APPDIR"
ls -al
find .
ls -al "$APPDIR"
ARCH=x86_64 ./appimagetool-x86_64.AppImage --comp gzip "$APPDIR" zen.AppImage
ARCH=$APPIMAGE_TARGET ./appimagetool-$APPIMAGE_TARGET.AppImage --comp gzip "$APPDIR" zen.AppImage
mkdir dist
mv zen.AppImage* dist/.
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: zen.AppImage
name: zen-x${{ matrix.arch }}.AppImage
path: ./dist/zen.AppImage
release:
@@ -328,13 +333,28 @@ jobs:
prerelease: false
title: 'Alpha build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
files: |
zen.linux.tar.bz2
zen.win64.zip
zen.source.tar.gz
linux.mar
windows.mar
macos.mar
zen.installer.exe
zen.installer.pretty.exe
zen.macos.dmg
zen.AppImage
zen.linux-x64.tar.bz2
zen.linux-x32.tar.bz2
zen-x64.AppImage
zen-x32.AppImage
zen.win-x64.zip
zen.win-x32.zip
linux-x64.mar
linux-x32.mar
windows-x64.mar
windows-x32.mar
macos-x64.mar
macos-aarch64.mar
zen.installer-x64.exe
zen.installer-x32.exe
zen.macos-x64.dmg
zen.macos-aarch64.dmg

View File

@@ -12,6 +12,10 @@ jobs:
permissions:
contents: write
runs-on: ubuntu-latest
strategy:
matrix:
arch: [x64, x32]
name: Build Linux - ${{ matrix.arch }}
steps:
- name: Install Node.js
@@ -86,6 +90,8 @@ jobs:
run: pnpm surfer download
- name: Import
env:
SURFER_COMPAT: ${{ matrix.arch == 'x32' }}
run: pnpm surfer import
- name: Bootstrap
@@ -95,14 +101,20 @@ jobs:
cd ..
- name: Build
env:
SURFER_COMPAT: ${{ matrix.arch == 'x32' }}
continue-on-error: true
run: sh .github/workflows/src/alpha-build.sh
- name: Build again if it failed
if: failure()
env:
SURFER_COMPAT: ${{ matrix.arch == 'x32' }}
run: sh .github/workflows/src/alpha-build.sh
- name: Package
env:
SURFER_COMPAT: ${{ matrix.arch == 'x32' }}
run: pnpm package
- name: Rename artifacts
@@ -113,17 +125,17 @@ jobs:
- name: Upload binary
uses: actions/upload-artifact@v4
with:
name: zen.linux.tar.bz2
name: zen.linux-${{ matrix.arch }}.tar.bz2
path: ./zen.linux.tar.bz2
- name: Upload mar
uses: actions/upload-artifact@v4
with:
name: linux.mar
name: linux-${{ matrix.arch }}.mar
path: ./linux.mar
- name: Upload update manifests
uses: actions/upload-artifact@v4
with:
name: linux_update_manifest
name: linux_update_manifest_${{ matrix.arch }}
path: ./dist/update

View File

@@ -9,7 +9,12 @@ on:
jobs:
mac-build:
runs-on: macos-14
name: Build macOS - ${{ matrix.arch }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-14, macos-13]
arch: [aarch64, x64]
steps:
- name: Install Node.js
@@ -60,7 +65,10 @@ jobs:
run: pnpm surfer download
- name: Import
run: pnpm surfer import
env:
SURFER_COMPAT: ${{ matrix.arch == 'x64' }}
run: |
pnpm surfer import
- name: Bootstrap
run: |
@@ -69,6 +77,8 @@ jobs:
cd ..
- name: build Zen
env:
SURFER_COMPAT: ${{ matrix.arch == 'x64' }}
run: sh .github/workflows/src/alpha-build.sh
- name: Rebuild Zen if failed
@@ -76,6 +86,8 @@ jobs:
run: sh .github/workflows/src/alpha-build.sh
- name: Package
env:
SURFER_COMPAT: ${{ matrix.arch == 'x64' }}
run: pnpm package
- name: Rename artifacts
@@ -86,17 +98,17 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: zen.macos.dmg
name: zen.macos-${{ matrix.arch }}.dmg
path: ./zen.macos.dmg
- name: Upload mar
uses: actions/upload-artifact@v4
with:
name: macos.mar
name: macos-${{ matrix.arch }}.mar
path: ./macos.mar
- name: Upload update manifests
uses: actions/upload-artifact@v4
with:
name: macos_update_manifest
name: macos_update_manifest_${{ matrix.arch }}
path: ./dist/update

View File

@@ -1,40 +0,0 @@
export WINSYSROOT="$(echo ~)/win-cross/vs2022"
export MIDL="$(echo ~)/win-cross/wine/bin/widl"
export WINE="$(echo ~)/win-cross/wine/bin/wine64"
export WINEDEBUG=-all
#? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
#? https://phabricator.services.mozilla.com/D170170
ac_add_options --target=x86_64-pc-windows-msvc
export MOZ_STUB_INSTALLER=1
export MOZ_PKG_FORMAT=TAR
export CROSS_BUILD=1
CROSS_COMPILE=1
TOOLS=$(echo ~)/win-cross
export MIDL="$TOOLS/wine/bin/widl"
export MOZ_INCLUDE_SOURCE_INFO=1
export MOZ_STUB_INSTALLER=1
export WINEDEBUG=-all
export WINE="$TOOLS/wine/bin/wine64"
#export WIN32_REDIST_DIR="$TOOLS"/vs2022/VC/Redist/MSVC/14.34.31931/x64/Microsoft.VC143.CRT
#export WIN_UCRT_REDIST_DIR="$TOOLS/vs2022/Windows Kits/10/Redist/10.0.22621.0/ucrt/DLLs/x64"
ac_add_options --disable-maintenance-service
ac_add_options --disable-bits-download
#if test "$ZEN_GA_GENERATE_PROFILE"; then
# mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
# ac_add_options --enable-profile-generate=cross
#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
#fi
# ALWAYS MANTAIN ONE LINE BREAK AT THE END OF THIS FILE

View File

@@ -16,7 +16,11 @@ on:
jobs:
windows-build:
name: Build Windows - ${{ matrix.arch }}
runs-on: ubuntu-latest
strategy:
matrix:
arch: [x64, x32]
steps:
- name: Install Node.js and pnpm
@@ -92,8 +96,6 @@ jobs:
chmod -R +x "$(echo ~)/win-cross/vs2022" || true
cat ../.github/workflows/src/windows_mozconfig >> ../configs/common/mozconfig
cd ..
npm install -g pnpm
export SURFER_PLATFORM="win32"
@@ -128,9 +130,13 @@ jobs:
path: ~/artifact
- name: Import
run: pnpm surfer import --verbose
env:
SURFER_COMPAT: ${{ matrix.arch == 'x32' }}
run: pnpm surfer import --verbose
- name: Build
env:
SURFER_COMPAT: ${{ matrix.arch == 'x32' }}
run: |
set -x
export SURFER_PLATFORM="win32"
@@ -141,6 +147,8 @@ jobs:
sh .github/workflows/src/alpha-build.sh
- name: Package
env:
SURFER_COMPAT: ${{ matrix.arch == 'x32' }}
run: |
set -x
export SURFER_PLATFORM="win32"
@@ -160,7 +168,7 @@ jobs:
uses: actions/upload-artifact@v4
if: ${{ !inputs.generate-gpo }}
with:
name: zen.win64.zip
name: zen.win-${{ matrix.arch }}.zip
path: ./zen.win64.zip
- name: Upload PGO build
@@ -174,19 +182,19 @@ jobs:
uses: actions/upload-artifact@v4
if: ${{ !inputs.generate-gpo }}
with:
name: windows.mar
name: windows-${{ matrix.arch }}.mar
path: ./windows.mar
- name: Upload installer
uses: actions/upload-artifact@v4
if: ${{ !inputs.generate-gpo }}
with:
name: zen.installer.exe
name: zen.installer-${{ matrix.arch }}.exe
path: ./dist/zen.installer.exe
- name: Upload installer stub
uses: actions/upload-artifact@v4
if: ${{ !inputs.generate-gpo }}
if: ${{ !inputs.generate-gpo && false }}
with:
name: zen.installer.pretty.exe
path: ./dist/zen.installer.pretty.exe
@@ -195,5 +203,5 @@ jobs:
uses: actions/upload-artifact@v4
if: ${{ !inputs.generate-gpo }}
with:
name: windows_update_manifest
name: windows_update_manifest_${{ matrix.arch }}
path: ./dist/update