From 98b2c582f242f9d717893824d1be6662a79c644a Mon Sep 17 00:00:00 2001 From: HarryHeres Date: Sat, 31 Aug 2024 23:53:37 +0200 Subject: [PATCH 1/9] Testing out Brew casks --- Cask/zen-browser.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Cask/zen-browser.rb diff --git a/Cask/zen-browser.rb b/Cask/zen-browser.rb new file mode 100644 index 000000000..e988e3eb4 --- /dev/null +++ b/Cask/zen-browser.rb @@ -0,0 +1,12 @@ +cask "zen-browser" do + version "" + sha256 "" + + url "https://github.com/zen-browser/desktop/releases/download/#{version}/-zen.macos-aarch64.dmg" + name "Zen Browser" + desc "Beautifully designed, privacy-focused browser packed with awesome jfeatures" + homepage "https://github.com/zen-browser/desktop" + + app "Zen Browser.app" +end + From dfa316831ff3536ccf892b4e9696e4b8d029033f Mon Sep 17 00:00:00 2001 From: HarryHeres Date: Sun, 1 Sep 2024 17:35:01 +0200 Subject: [PATCH 2/9] Testing out Homebrew cask --- Cask/zen-browser.rb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Cask/zen-browser.rb b/Cask/zen-browser.rb index e988e3eb4..69e8413fa 100644 --- a/Cask/zen-browser.rb +++ b/Cask/zen-browser.rb @@ -1,11 +1,21 @@ cask "zen-browser" do - version "" - sha256 "" + arch arm: "aarch64", intel: "x64" + version "1.0.0-a.34" + sha256 arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace258074", + intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6" - url "https://github.com/zen-browser/desktop/releases/download/#{version}/-zen.macos-aarch64.dmg" + url "https://github.com/zen-browser/desktop/releases/download/#{version}/zen.macos-#{arch}.dmg" name "Zen Browser" desc "Beautifully designed, privacy-focused browser packed with awesome jfeatures" - homepage "https://github.com/zen-browser/desktop" + homepage "https://zen-browser.app/" + + livecheck do + url :stable + regex(/[0-9].*-a.[0-9]*/i) + end + + zap = [] + depends_on = [] app "Zen Browser.app" end From e78fa3f544313beabf593bcb30bae254c27955a2 Mon Sep 17 00:00:00 2001 From: HarryHeres Date: Sun, 1 Sep 2024 18:09:36 +0200 Subject: [PATCH 3/9] Fixing typo --- Cask/zen-browser.rb | 22 ---------------------- Casks/zen-browser.rb | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 22 deletions(-) delete mode 100644 Cask/zen-browser.rb create mode 100644 Casks/zen-browser.rb diff --git a/Cask/zen-browser.rb b/Cask/zen-browser.rb deleted file mode 100644 index 69e8413fa..000000000 --- a/Cask/zen-browser.rb +++ /dev/null @@ -1,22 +0,0 @@ -cask "zen-browser" do - arch arm: "aarch64", intel: "x64" - version "1.0.0-a.34" - sha256 arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace258074", - intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6" - - url "https://github.com/zen-browser/desktop/releases/download/#{version}/zen.macos-#{arch}.dmg" - name "Zen Browser" - desc "Beautifully designed, privacy-focused browser packed with awesome jfeatures" - homepage "https://zen-browser.app/" - - livecheck do - url :stable - regex(/[0-9].*-a.[0-9]*/i) - end - - zap = [] - depends_on = [] - - app "Zen Browser.app" -end - diff --git a/Casks/zen-browser.rb b/Casks/zen-browser.rb new file mode 100644 index 000000000..c7e99d6aa --- /dev/null +++ b/Casks/zen-browser.rb @@ -0,0 +1,31 @@ +cask("zen-browser") do + arch(arm: "aarch64", intel: "x64") + version("1.0.0-a.34") + sha256( + arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace2580747", + intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6" + ) + + url("https://github.com/zen-browser/desktop/releases/download/#{version}/zen.macos-#{arch}.dmg") + name("Zen Browser") + desc("Beautifully designed, privacy-focused browser packed with awesome features") + homepage("https://zen-browser.app/") + + livecheck do + url(:stable) + regex(/[0-9].*-a.[0-9]*/i) + end + + zap = [ + "$HOME/Library/Preferences/org.mozilla.com.zen.browser.plist", + "$HOME/Library/Saved Application State/org.mozilla.com.zen.browser.savedState" + ] + + depends_on = [] + + app("Zen Browser.app") + + postflight do + system("xattr -c '/Applications/Zen Browser.app/'") + end +end From cf9b266bcaddd658a3e6b41f9560d0d6fc6fe410 Mon Sep 17 00:00:00 2001 From: HarryHeres Date: Sun, 1 Sep 2024 19:10:25 +0200 Subject: [PATCH 4/9] Adding Homebrew compatibility --- .github/workflows/macos-alpha-build.yml | 3 +++ .github/workflows/src/update-homebrew.sh | 9 +++++++++ Casks/zen-browser.rb | 13 ++++--------- README.md | 10 ++++++++++ 4 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/src/update-homebrew.sh diff --git a/.github/workflows/macos-alpha-build.yml b/.github/workflows/macos-alpha-build.yml index 6f4992c58..ddb095252 100644 --- a/.github/workflows/macos-alpha-build.yml +++ b/.github/workflows/macos-alpha-build.yml @@ -148,3 +148,6 @@ jobs: with: name: macos_update_manifest_${{ matrix.arch }} path: ./dist/update + + - name: Update Homebrew + run: sh .github/workflows/src/update-homebrew.sh diff --git a/.github/workflows/src/update-homebrew.sh b/.github/workflows/src/update-homebrew.sh new file mode 100644 index 000000000..d1d0b150e --- /dev/null +++ b/.github/workflows/src/update-homebrew.sh @@ -0,0 +1,9 @@ +latest_version="$(git describe --tags --abbrev=0)" +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 "s/sha256(.*)/sha256(arm:'${sha_arm}', intel:'${sha_x64}')/" ./Casks/zen-browser.rb + + diff --git a/Casks/zen-browser.rb b/Casks/zen-browser.rb index c7e99d6aa..f5c71a967 100644 --- a/Casks/zen-browser.rb +++ b/Casks/zen-browser.rb @@ -1,10 +1,7 @@ cask("zen-browser") do arch(arm: "aarch64", intel: "x64") version("1.0.0-a.34") - sha256( - arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace2580747", - intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6" - ) + sha256(arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace2580747", intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6") url("https://github.com/zen-browser/desktop/releases/download/#{version}/zen.macos-#{arch}.dmg") name("Zen Browser") @@ -16,13 +13,11 @@ cask("zen-browser") do regex(/[0-9].*-a.[0-9]*/i) end - zap = [ - "$HOME/Library/Preferences/org.mozilla.com.zen.browser.plist", - "$HOME/Library/Saved Application State/org.mozilla.com.zen.browser.savedState" + zap trash: [ + "~/Library/Preferences/org.mozilla.com.zen.browser.plist", + "~/Library/Saved Application State/org.mozilla.com.zen.browser.savedState" ] - depends_on = [] - app("Zen Browser.app") postflight do diff --git a/README.md b/README.md index 20c7a272f..99bdee821 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,16 @@ Zen is built with performance in mind, and we have optimized the browser to be a * Checkout the latest [performance benchmarks](https://docs.zen-browser.app/benchmarks)! +# Installation + +## MacOS +You can install the Zen Browser using Homebrew: + +``` +brew tap zen-browser/browser https://github.com/zen-browser/desktop.git +brew install zen-browser +``` + # 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 467b444535db28027609b7720d17d1fd35116b01 Mon Sep 17 00:00:00 2001 From: HarryHeres Date: Sun, 1 Sep 2024 20:04:36 +0200 Subject: [PATCH 5/9] PR changes --- .github/workflows/alpha.yml | 52 ++++++++++++++++++++++++ .github/workflows/macos-alpha-build.yml | 3 -- .github/workflows/src/update-homebrew.sh | 6 +-- 3 files changed, 54 insertions(+), 7 deletions(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index b953d28d7..9fa90f7f3 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -460,4 +460,56 @@ jobs: 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: Setup git + run: | + 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 + + - name: Commit changes + run: | + git add Casks/zen-browser.rb + git commit -m "Updated Homebrew Cask" + + - name: Create pull request + uses: peter-evans/create-pull-request@v6 + env: + GIT_TRACE: 1 + GIT_CURL_VERBOSE: 1 + with: + token: ${{ secrets.DEPLOY_KEY }} + 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 Homebrew Cask to version ${{ needs.build-data.outputs.version }}. + + @mauro-balades + branch: brew-update-to-${{ needs.build-data.outputs.version }} + base: master + git-token: ${{ secrets.DEPLOY_KEY }} + delete-branch: true + + - name: Clean up + run: | + rm -rf zen.macos-aarch64.dmg + rm -rf zen.macos-aarch64.dmg diff --git a/.github/workflows/macos-alpha-build.yml b/.github/workflows/macos-alpha-build.yml index ddb095252..6f4992c58 100644 --- a/.github/workflows/macos-alpha-build.yml +++ b/.github/workflows/macos-alpha-build.yml @@ -148,6 +148,3 @@ jobs: with: name: macos_update_manifest_${{ matrix.arch }} path: ./dist/update - - - name: Update Homebrew - run: sh .github/workflows/src/update-homebrew.sh diff --git a/.github/workflows/src/update-homebrew.sh b/.github/workflows/src/update-homebrew.sh index d1d0b150e..717dc976c 100644 --- a/.github/workflows/src/update-homebrew.sh +++ b/.github/workflows/src/update-homebrew.sh @@ -1,9 +1,7 @@ latest_version="$(git describe --tags --abbrev=0)" 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 +sha_x64 = shasum -a 256 zen.macos-x64.dmg +sha_arm = shasum -a 256 zen.macos-aarch64.dmg sed -i "s/sha256(.*)/sha256(arm:'${sha_arm}', intel:'${sha_x64}')/" ./Casks/zen-browser.rb - - From 74f304ef18b1280a5d215212e141a9e29306b097 Mon Sep 17 00:00:00 2001 From: HarryHeres Date: Sun, 1 Sep 2024 20:10:58 +0200 Subject: [PATCH 6/9] Fixing update-homebrew script --- .github/workflows/src/update-homebrew.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/src/update-homebrew.sh b/.github/workflows/src/update-homebrew.sh index 717dc976c..541cb2c6e 100644 --- a/.github/workflows/src/update-homebrew.sh +++ b/.github/workflows/src/update-homebrew.sh @@ -1,7 +1,7 @@ latest_version="$(git describe --tags --abbrev=0)" 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 +sha_x64=$(shasum -a 256 zen.macos-x64.dmg) +sha_arm=$(shasum -a 256 zen.macos-aarch64.dmg) sed -i "s/sha256(.*)/sha256(arm:'${sha_arm}', intel:'${sha_x64}')/" ./Casks/zen-browser.rb From 5ce28c013623974ce5af876cc72543aef535e91c Mon Sep 17 00:00:00 2001 From: HarryHeres Date: Sun, 1 Sep 2024 20:13:26 +0200 Subject: [PATCH 7/9] Updating update-homebrew script --- .github/workflows/src/update-homebrew.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/src/update-homebrew.sh b/.github/workflows/src/update-homebrew.sh index 541cb2c6e..b309586ce 100644 --- a/.github/workflows/src/update-homebrew.sh +++ b/.github/workflows/src/update-homebrew.sh @@ -1,4 +1,4 @@ -latest_version="$(git describe --tags --abbrev=0)" +latest_version=$(git describe --tags --abbrev=0) sed -i "s/version(.*)/version('${latest_version}')/" ./Casks/zen-browser.rb sha_x64=$(shasum -a 256 zen.macos-x64.dmg) From 881f556534ec7b73cd03a0bc0d3e811e9fa59420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mauro=20=F0=9F=A4=99?= <91018726+mauro-balades@users.noreply.github.com> Date: Sun, 1 Sep 2024 11:18:27 -0700 Subject: [PATCH 8/9] Update alpha.yml --- .github/workflows/alpha.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 9fa90f7f3..8e3c745ac 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -491,23 +491,12 @@ jobs: git add Casks/zen-browser.rb git commit -m "Updated Homebrew Cask" - - name: Create pull request - uses: peter-evans/create-pull-request@v6 - env: - GIT_TRACE: 1 - GIT_CURL_VERBOSE: 1 + - uses: stefanzweifel/git-auto-commit-action@v4 + if: ${{ github.event.inputs.update_version == 'true' }} with: - token: ${{ secrets.DEPLOY_KEY }} - 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 Homebrew Cask to version ${{ needs.build-data.outputs.version }}. - - @mauro-balades - branch: brew-update-to-${{ needs.build-data.outputs.version }} - base: master - git-token: ${{ secrets.DEPLOY_KEY }} - delete-branch: true + 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 - name: Clean up run: | From 3e5742be0d625677f2c086c318e5bd631829d7ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?mauro=20=F0=9F=A4=99?= <91018726+mauro-balades@users.noreply.github.com> Date: Sun, 1 Sep 2024 11:44:58 -0700 Subject: [PATCH 9/9] Update alpha.yml --- .github/workflows/alpha.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 8e3c745ac..8c3c3d0f1 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -468,6 +468,12 @@ jobs: runs-on: ubuntu-latest steps: + - name: Clone flatpak repo + uses: actions/checkout@v4 + with: + repository: flathub/io.github.zen_browser.zen + token: ${{ secrets.DEPLOY_KEY }} + - name: Setup git run: | git config --global user.name "github-actions[bot]" @@ -486,10 +492,10 @@ jobs: - name: Update zen-browser Cask run: sh .github/workflows/src/update-homebrew.sh - - name: Commit changes - run: | - git add Casks/zen-browser.rb - git commit -m "Updated Homebrew Cask" + - 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' }} @@ -498,7 +504,3 @@ jobs: commit_user_name: Zen Browser Robot commit_user_email: zen-browser-bot@users.noreply.github.com - - name: Clean up - run: | - rm -rf zen.macos-aarch64.dmg - rm -rf zen.macos-aarch64.dmg