Skip to content

Commit

Permalink
Formatted the entire project
Browse files Browse the repository at this point in the history
  • Loading branch information
mauro-balades committed Sep 9, 2024
1 parent b0e7e8c commit 8013618
Show file tree
Hide file tree
Showing 56 changed files with 1,247 additions and 1,231 deletions.
1 change: 0 additions & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@

patreon: zen_browser
ko_fi: zen_browser
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ body:
label: Reproducible?
description: Is this issue reproducible on Firefox?
options:
- label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
- label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
- type: input
id: version
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
blank_issues_enabled: false
blank_issues_enabled: false
28 changes: 12 additions & 16 deletions .github/workflows/alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ on:
type: 'boolean'

jobs:

build-data:
permissions:
contents: write
Expand All @@ -34,7 +33,7 @@ jobs:
with:
submodules: recursive
token: ${{ secrets.DEPLOY_KEY }}

- name: Install pnpm
run: npm install -g pnpm

Expand Down Expand Up @@ -97,7 +96,7 @@ jobs:

- name: Install pnpm
run: npm install -g pnpm

- name: Get pnpm store directory
id: pnpm-cache
shell: bash
Expand All @@ -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)"
Expand All @@ -128,7 +127,6 @@ jobs:
exit 1
fi
source:
permissions:
contents: write
Expand Down Expand Up @@ -225,7 +223,7 @@ jobs:
permissions:
contents: write
secrets: inherit
needs: [build-data]
needs: [build-data]
with:
build-version: ${{ needs.build-data.outputs.version }}

Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand 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
Expand All @@ -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
Expand All @@ -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

2 changes: 1 addition & 1 deletion .github/workflows/clear-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:
cache_id: cache.id,
})
}
console.log("Clear completed")
console.log("Clear completed")
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Close inactive issues
on:
schedule:
- cron: "0 0 * * *"
- cron: '0 0 * * *'
workflow_dispatch:

jobs:
Expand All @@ -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.
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/windows-alpha-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Windows Alpha Build
on:
workflow_call:
inputs:
generate-gpo:
generate-gpo:
required: true
type: boolean
default: false
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/windows-profile-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,26 @@ 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
- name: Download firefox
run: |
git config --global core.safecrlf false
pnpm surfer download
- name: Generate
- name: Generate
run: |
ls
$Env:USE_MINTTY = "0"
Expand All @@ -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
Expand All @@ -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' }}
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
"span": "cpp",
"vector": "cpp"
}
}
}
10 changes: 5 additions & 5 deletions AppDir/distribution/policies.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"policies": {
"DisableAppUpdate": true,
"AppAutoUpdate": false,
"ManualAppUpdateOnly": true,
"BackgroundAppUpdate": false
"DisableAppUpdate": true,
"AppAutoUpdate": false,
"ManualAppUpdateOnly": true,
"BackgroundAppUpdate": false
}
}
}
25 changes: 12 additions & 13 deletions docs/changes.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@

## Changed things that should be tested each release

* Workspaces
* Sidebar
* Split views
* Vertical tabs (expanded and not expanded)
* Tab groups
* Welcome Page
* Overall performance
* Overall stability
* Pinning tabs (Grid layout)
* Overall UX
* Themes Page
* Settings Page
- Workspaces
- Sidebar
- Split views
- Vertical tabs (expanded and not expanded)
- Tab groups
- Welcome Page
- Overall performance
- Overall stability
- Pinning tabs (Grid layout)
- Overall UX
- Themes Page
- Settings Page
1 change: 0 additions & 1 deletion docs/key-shortcuts.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# Custom Keyboard Shortcuts

```json
Expand Down
53 changes: 26 additions & 27 deletions docs/requirements.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@

# Supported CPUs for optimized builds (Windows and Linux)

> If you CPU is not listed, you should use the "Generic" build.
* AMD Family 15h (Excavator)
* AMD Family 17h (Zen)
* AMD Family 17h (Zen+)
* AMD Family 17h (Zen 2)
* AMD Family 19h (Zen 3)
* Intel 4th Gen Core (Haswell)
* Intel 5th Gen Core (Broadwell)
* Intel 6th Gen Core (Skylake)
* Intel 7th Gen Core (Kaby Lake)
* Intel 8/9th Gen Core (Coffee Lake)
* Intel 10th Gen Core (Comet Lake)
* Intel 12th Gen (Alder Lake)
* Intel 13th Gen (Raptor Lake)
* Intel 14th Gen (Raptor Lake Refresh)
* Intel 15th Gen (Lunar / Arrow Lake)
* AMD Family 19h (Zen 4 / Zen 4c)
* AMD Family 1Ah (Zen 5 / Zen 5c)
* Intel 6th Gen Core (Skylake X)
* Intel 8th Gen Core i3 (Cannon Lake)
* Intel Xeon / 10th Gen Core (Ice Lake)
* Intel Xeon (Cascade Lake)
* Intel Xeon (Cooper Lake)
* Intel 3rd Gen 10nm++ (Tiger Lake)
* Intel 4th Gen 10nm++ (Sapphire Rapids)
* Intel 5th Gen 10nm++ (Emerald Rapids)
* Intel 11th Gen (Rocket Lake)
- AMD Family 15h (Excavator)
- AMD Family 17h (Zen)
- AMD Family 17h (Zen+)
- AMD Family 17h (Zen 2)
- AMD Family 19h (Zen 3)
- Intel 4th Gen Core (Haswell)
- Intel 5th Gen Core (Broadwell)
- Intel 6th Gen Core (Skylake)
- Intel 7th Gen Core (Kaby Lake)
- Intel 8/9th Gen Core (Coffee Lake)
- Intel 10th Gen Core (Comet Lake)
- Intel 12th Gen (Alder Lake)
- Intel 13th Gen (Raptor Lake)
- Intel 14th Gen (Raptor Lake Refresh)
- Intel 15th Gen (Lunar / Arrow Lake)
- AMD Family 19h (Zen 4 / Zen 4c)
- AMD Family 1Ah (Zen 5 / Zen 5c)
- Intel 6th Gen Core (Skylake X)
- Intel 8th Gen Core i3 (Cannon Lake)
- Intel Xeon / 10th Gen Core (Ice Lake)
- Intel Xeon (Cascade Lake)
- Intel Xeon (Cooper Lake)
- Intel 3rd Gen 10nm++ (Tiger Lake)
- Intel 4th Gen 10nm++ (Sapphire Rapids)
- Intel 5th Gen 10nm++ (Emerald Rapids)
- Intel 11th Gen (Rocket Lake)
Loading

0 comments on commit 8013618

Please sign in to comment.