From 6b20c47f067c7c77fa572be3f7e73c145bcfdec5 Mon Sep 17 00:00:00 2001 From: AltCode <12354672+AlternateRT@users.noreply.github.com> Date: Tue, 10 Sep 2024 15:45:39 +0200 Subject: [PATCH 1/3] Remove Homebrew Cask files These are not needed any more; Zen has been accepted into the Homebrew Cask repository --- .github/workflows/alpha.yml | 46 +----------------------- .github/workflows/src/update-homebrew.sh | 8 ----- Casks/zen-browser.rb | 27 -------------- README.md | 24 ++++++------- 4 files changed, 13 insertions(+), 92 deletions(-) delete mode 100644 .github/workflows/src/update-homebrew.sh delete mode 100644 Casks/zen-browser.rb diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 274737f04..1fe445e7a 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -508,54 +508,10 @@ jobs: commit-message: 🚀 Update to version ${{ needs.build-data.outputs.version }} 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 }}. + 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 - name: Homebrew release - needs: [release, mac, build-data] - runs-on: ubuntu-latest - - steps: - - name: Clone repo - 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 - uses: actions/download-artifact@v4 - with: - name: zen.macos-aarch64.dmg - - - name: Download macOS x64 build - uses: actions/download-artifact@v4 - with: - name: zen.macos-x64.dmg - - - name: Update zen-browser Cask - run: sh .github/workflows/src/update-homebrew.sh ${{ needs.build-data.outputs.version }} - - - name: Clean up - run: | - rm -rf zen.macos-x64.dmg - rm -rf zen.macos-aarch64.dmg - - - uses: stefanzweifel/git-auto-commit-action@v4 - if: ${{ github.event.inputs.update_version == 'true' }} - with: - 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 diff --git a/.github/workflows/src/update-homebrew.sh b/.github/workflows/src/update-homebrew.sh deleted file mode 100644 index ffa5206fd..000000000 --- a/.github/workflows/src/update-homebrew.sh +++ /dev/null @@ -1,8 +0,0 @@ - -latest_version=$1 -sed -i "s/version \".*\"/version \"${latest_version}\"/" ./Casks/zen-browser.rb - -sha_x64=$(shasum -a 256 zen.macos-x64.dmg) -sha_arm=$(shasum -a 256 zen.macos-aarch64.dmg) - -sed -i "N;s/sha256 arm: \".*\",\n intel: \".*\"/sha256 arm: \"${sha_arm}\",\n intel: \"${sha_x64}\"/" ./Casks/zen-browser.rb diff --git a/Casks/zen-browser.rb b/Casks/zen-browser.rb deleted file mode 100644 index dd8c2a69a..000000000 --- a/Casks/zen-browser.rb +++ /dev/null @@ -1,27 +0,0 @@ -cask "zen-browser" do - arch arm: "aarch64", intel: "x64" - - version "1.0.0-a.39" - sha256 arm: "0cf18406f61225c53ca20391b37dcdcbfd3dd80bf758639b56962e38085e529d", - intel: "4de8907641989639ee159681cd131a22a20fcf414373543a62ee0f9df2739845" - - url "https://github.com/zen-browser/desktop/releases/download/#{version}/zen.macos-#{arch}.dmg", - verified: "github.com/zen-browser/desktop/" - name "Zen Browser" - desc "Beautifully designed, privacy-focused browser packed with awesome features" - homepage "https://zen-browser.app/" - - auto_updates true - depends_on macos: ">= :catalina" - - app "Zen Browser.app" - - zap trash: [ - "~/Library/Application Support/zen", - "~/Library/Caches/Mozilla/updates/Applications/Zen Browser", - "~/Library/Caches/zen", - "~/Library/Preferences/org.mozilla.com.zen.browser.plist", - "~/Library/Saved Application State/org.mozilla.com.zen.browser.savedState", - ], - rmdir: "~/Library/Caches/Mozilla" -end diff --git a/README.md b/README.md index ed7e55d42..8260e9280 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Zen Browser Experience tranquillity while browsing the web without people tracking you! -- [Website](https://www.zen-browser.app) -- [Download](https://www.zen-browser.app/download) -- [Release Notes](https://www.zen-browser.app/release-notes/latest) +- [Website](https://zen-browser.app) +- [Download](https://zen-browser.app/download) +- [Release Notes](https://zen-browser.app/release-notes/latest) [![Downloads](https://img.shields.io/github/downloads/zen-browser/desktop/total.svg)](https://github.com/zen-browser/desktop/releases) [![Crowdin](https://badges.crowdin.net/zen-browser/localized.svg)](https://crowdin.com/project/zen-browser) @@ -26,7 +26,7 @@ Experience tranquillity while browsing the web without people tracking you! Zen is currently built using firefox version `130.0`! -- Check out the latest [release notes](https://www.zen-browser.app/release-notes)! +- Check out the latest [release notes](https://zen-browser.app/release-notes)! # Performance @@ -36,14 +36,18 @@ Zen is built with performance in mind, and we have optimized the browser to be a # Installation -## MacOS +## Supported Operating Systems -### Homebrew (recommended) +Zen is available for Linux, macOS, and Windows. You can download the latest version from the official website at [zen-browser.app](https://zen-browser.app/download), or from the [GitHub Releases](https://github.com/zen-browser/desktop/releases) page. -You can install the Zen Browser using Homebrew: +### macOS + +- Requires macOS 10.15 or later +- Available for ARM and Intel architectures + +You can also install Zen using Homebrew: ``` -brew tap zen-browser/browser https://github.com/zen-browser/desktop.git brew install --cask zen-browser ``` @@ -54,10 +58,6 @@ brew update brew upgrade --greedy zen-browser ``` -### Manual installation - -As there are issues with the signing process of the `.app` file, we recommend following this [guide](https://github.com/zen-browser/desktop/issues/53). - # Core Components Some components used by @zen-browser as an attempt to make firefox forks a better place. You can find them [here](https://github.com/zen-browser/components). From 1bbac89727589946d5100dfcc771360e87d90d14 Mon Sep 17 00:00:00 2001 From: AltCode <12354672+AlternateRT@users.noreply.github.com> Date: Tue, 10 Sep 2024 17:00:05 +0200 Subject: [PATCH 2/3] Remove brew upgrade --greedy instructions --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 8260e9280..9bb3a8778 100644 --- a/README.md +++ b/README.md @@ -51,12 +51,7 @@ You can also install Zen using Homebrew: brew install --cask zen-browser ``` -To upgrade the browser to a newer version, you can either use the embedded update functionality in `About Zen` or use the following commands: - -``` -brew update -brew upgrade --greedy zen-browser -``` +To upgrade the browser to a newer version, use the embedded update functionality in `About Zen`. # Core Components From 9f50343a8fc5c64c581e9fe0167c045025501c95 Mon Sep 17 00:00:00 2001 From: AltCode <12354672+AlternateRT@users.noreply.github.com> Date: Wed, 11 Sep 2024 19:31:57 +0200 Subject: [PATCH 3/3] Added a new workflow for Homebrew --- .github/workflows/alpha.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 1fe445e7a..0788ad4cd 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -515,3 +515,28 @@ jobs: base: master git-token: ${{ secrets.DEPLOY_KEY }} delete-branch: true + + release-homebrew: + if: ${{ github.event.inputs.create_release == 'true' }} + permissions: write-all + name: Homebrew release + 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-bot + + - name: Bump zen-browser + uses: Homebrew/actions/bump-packages@master + with: + token: ${{ secrets.DEPLOY_KEY }} + casks: zen-browser