Formatted the entire project

This commit is contained in:
mauro-balades
2024-09-09 19:36:14 +02:00
parent b0e7e8cb0d
commit 80136189b1
56 changed files with 1246 additions and 1230 deletions

View File

@@ -15,7 +15,6 @@ on:
type: 'boolean'
jobs:
build-data:
permissions:
contents: write
@@ -34,7 +33,7 @@ jobs:
with:
submodules: recursive
token: ${{ secrets.DEPLOY_KEY }}
- name: Install pnpm
run: npm install -g pnpm
@@ -97,7 +96,7 @@ jobs:
- name: Install pnpm
run: npm install -g pnpm
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
@@ -115,7 +114,7 @@ jobs:
run: |
echo "There's a bug in the surfer CLI, we run this so that surfer sets everything up correctly"
pnpm surfer ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
- name: Check version
run: |
echo "$(pwd)"
@@ -128,7 +127,6 @@ jobs:
exit 1
fi
source:
permissions:
contents: write
@@ -225,7 +223,7 @@ jobs:
permissions:
contents: write
secrets: inherit
needs: [build-data]
needs: [build-data]
with:
build-version: ${{ needs.build-data.outputs.version }}
@@ -344,7 +342,7 @@ jobs:
cp -a ../windows_update_manifest_generic/. updates/
cp -a ../windows_update_manifest_specific/. updates/
cp -a ../macos_update_manifest_aarch64/. updates/
cp -a ../macos_update_manifest_x64/. updates/
@@ -430,7 +428,6 @@ jobs:
# output the version to the file
echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: '[release]: Update flatpak manifest'
@@ -512,13 +509,13 @@ jobs:
title: 🚀 Update to version ${{ needs.build-data.outputs.version }}
body: |
This PR updates the Zen Browser Flatpak package to version ${{ needs.build-data.outputs.version }}.
@${{ github.actor }} please review and merge this PR.
branch: update-to-${{ needs.build-data.outputs.version }}
base: master
git-token: ${{ secrets.DEPLOY_KEY }}
delete-branch: true
release-homebrew:
if: ${{ github.event.inputs.create_release == 'true' }}
permissions: write-all
@@ -531,14 +528,14 @@ jobs:
uses: actions/checkout@v4
with:
token: ${{ secrets.DEPLOY_KEY }}
- name: Setup git
run: |
git pull
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"
- name: Download macOS ARM build
- name: Download macOS ARM build
uses: actions/download-artifact@v4
with:
name: zen.macos-aarch64.dmg
@@ -550,9 +547,9 @@ jobs:
- name: Update zen-browser Cask
run: sh .github/workflows/src/update-homebrew.sh ${{ needs.build-data.outputs.version }}
- name: Clean up
run: |
- name: Clean up
run: |
rm -rf zen.macos-x64.dmg
rm -rf zen.macos-aarch64.dmg
@@ -562,4 +559,3 @@ jobs:
commit_message: 🔖 Update version to ${{ steps.data.outputs.version }} for homebrew!
commit_user_name: Zen Browser Robot
commit_user_email: zen-browser-bot@users.noreply.github.com

View File

@@ -27,4 +27,4 @@ jobs:
cache_id: cache.id,
})
}
console.log("Clear completed")
console.log("Clear completed")

View File

@@ -1,7 +1,7 @@
name: Close inactive issues
on:
schedule:
- cron: "0 0 * * *"
- cron: '0 0 * * *'
workflow_dispatch:
jobs:
@@ -15,7 +15,7 @@ jobs:
with:
days-before-issue-stale: 30
days-before-issue-close: 14
stale-issue-label: "stale"
stale-issue-label: 'stale'
stale-issue-message: |
This issue is stale because it has been open for 30 days with no activity.

View File

@@ -2,7 +2,7 @@ name: Windows Alpha Build
on:
workflow_call:
inputs:
generate-gpo:
generate-gpo:
required: true
type: boolean
default: false
@@ -59,7 +59,7 @@ jobs:
- name: Download
run: pnpm surfer download
- name: "win-cross Cache"
- name: 'win-cross Cache'
env:
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
id: cache-win-cross
@@ -81,16 +81,16 @@ jobs:
set -x
mkdir -p ~/win-cross
cd engine/
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
run: |
set -x
@@ -113,14 +113,14 @@ jobs:
ls ~/win-cross/wine || true
ls ~/win-cross/vs2022 || true
- name: setup Rust
- name: setup Rust
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
rustup target add x86_64-pc-windows-msvc
cargo install cargo-download
cargo download -x windows=0.52.0
@@ -137,7 +137,7 @@ jobs:
- name: Build language packs
run: sh scripts/download-language-packs.sh
- uses: actions/download-artifact@v4
name: Download artifact if use profdata
if: ${{ !inputs.generate-gpo }}
@@ -210,7 +210,7 @@ jobs:
with:
name: ${{ matrix.generic == true && 'generic' || 'specific' }}-${{ inputs.profile-data-path-archive }}
path: ./zen.win64-pgo-stage-1.zip
- name: Upload mar
uses: actions/upload-artifact@v4
if: ${{ !inputs.generate-gpo }}

View File

@@ -40,18 +40,18 @@ jobs:
run: |
npm i -g @zen-browser/surfer
- uses: actions/download-artifact@v4
name: Download artifact
name: Download artifact
with:
path: C:\artifact
name: ${{ matrix.generic == true && 'generic' || 'specific' }}-zen-windows-x86_64-profile-data-and-jarlog.zip
- name: Unpack artifact
- name: Unpack artifact
run: |
cd C:\artifact
ls
Expand-Archive -Path .\${{ inputs.profile-data-path-archive }} -DestinationPath C:\artifact
ls
- name: Setup
- 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
@@ -59,7 +59,7 @@ jobs:
run: |
git config --global core.safecrlf false
pnpm surfer download
- name: Generate
- name: Generate
run: |
ls
$Env:USE_MINTTY = "0"
@@ -72,7 +72,7 @@ jobs:
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_current\mozilla-build-run.sh
- name: 🐛 Debug Session
if: ${{ failure() }}
uses: Warpbuilds/gha-debug@v1.3
@@ -91,4 +91,4 @@ jobs:
path: |
merged.profdata
en-US.log
name: windows-profdata-${{ matrix.generic == true && 'generic' || 'specific' }}
name: windows-profdata-${{ matrix.generic == true && 'generic' || 'specific' }}