Merge branch 'dev' into dev

Signed-off-by: mr. m  <91018726+mr-cheff@users.noreply.github.com>
This commit is contained in:
mr. m
2024-11-28 18:57:22 +01:00
committed by GitHub
73 changed files with 1837 additions and 442 deletions

View File

@@ -153,7 +153,7 @@ jobs:
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
check-release:
runs-on: ubuntu-latest
@@ -209,7 +209,7 @@ jobs:
contents: write
runs-on: ubuntu-latest
needs: [build-data, check-release]
steps:
- name: Checkout repository
uses: actions/checkout@v4
@@ -345,7 +345,7 @@ jobs:
run: |
npm install -g pnpm
sudo apt-get update
sudo apt-get -y install libfuse2 desktop-file-utils appstream
sudo apt-get -y install libfuse2 desktop-file-utils appstream
- name: Download Linux build
uses: actions/download-artifact@v4
@@ -437,7 +437,7 @@ jobs:
mkdir -p updates
cp -a ../linux_update_manifest_generic/. updates/
cp -a ../linux_update_manifest_specific/. updates/
cp -a ../linux_update_manifest_aarch64/. 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/
@@ -457,7 +457,7 @@ jobs:
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
@@ -566,7 +566,7 @@ jobs:
with:
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: Checkout Flatpak repository
uses: actions/checkout@v4
@@ -589,7 +589,7 @@ jobs:
with:
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
@@ -673,10 +673,10 @@ jobs:
git-token: ${{ secrets.DEPLOY_KEY }}
delete-branch: true
release-homebrew:
release-homebrew-alpha:
if: ${{ inputs.create_release && inputs.update_branch == 'alpha' }}
permissions: write-all
name: Homebrew release
name: Homebrew release for alpha build
needs: [release, mac, build-data]
runs-on: macos-latest
@@ -690,10 +690,35 @@ jobs:
- name: Setup Git
uses: Homebrew/actions/git-user-config@master
with:
username: zen-browser-bot
username: zen-browser-auto
- name: Bump zen-browser
- name: Bump cask
uses: Homebrew/actions/bump-packages@master
with:
token: ${{ secrets.DEPLOY_KEY }}
casks: zen-browser
release-homebrew-twilight:
if: ${{ inputs.create_release && inputs.update_branch == 'twilight' }}
permissions: write-all
name: Homebrew release for twilight build
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-auto
- name: Bump cask
uses: Homebrew/actions/bump-packages@master
with:
token: ${{ secrets.DEPLOY_KEY }}
casks: zen-browser@twilight

View File

@@ -88,9 +88,10 @@ 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

View File

@@ -28,4 +28,4 @@ jobs:
with:
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

View File

@@ -71,7 +71,7 @@ jobs:
- name: Download Firefox and dependencies
run: |
git config --global core.safecrlf false
git config --global core.safecrlf false
pnpm surfer download
- name: Import patches

View File

@@ -28,7 +28,7 @@ jobs:
fail-fast: false
matrix:
arch: [x86_64, x86_64-v3, aarch64]
steps:
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
@@ -213,7 +213,7 @@ jobs:
find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \;
fi
- name: Upload artifact (dist object)
- name: Upload dist object
if: ${{ !inputs.generate-gpo }}
uses: actions/upload-artifact@v4
with: