Merge branch 'dev' of https://github.com/zen-browser/desktop into update-firefox-137

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,7 +6,8 @@ body:
       value: |
         Thank you for filing a bug report!
 
-        ## Important
+        ## IMPORTANT READ
+        - Please provide descriptive titles. Bad titles do more harm than good.
         - Please search existing issues to avoid creating duplicates.
         - For enhancement requests, please use GitHub Discussions.
         - Please fill out the template below to the best of your ability.
@@ -20,6 +21,10 @@ body:
         - label: I have read the instructions.
         - label: I have searched existing issues and avoided creating duplicates.
         - label: I am not filing an enhancement request.
+        - label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
+        - label: I have checked that this issue can be reproduced once I removed all my Mods and Custom CSS.
+    validations:
+      required: true
   - type: textarea
     id: what-happened
     attributes:
@@ -28,19 +33,12 @@ body:
       placeholder: Tell us what you see!
     validations:
       required: true
-  - type: checkboxes
-    id: firefox
-    attributes:
-      label: Reproducible?
-      description: Is this issue reproducible on Firefox?
-      options:
-        - label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
   - type: input
     id: version
     attributes:
       label: Version
       description: What version of our software are you running? Please do not use "latest" or "newest" as version numbers. Go to `Help -> About Zen` to find the version number.
-      placeholder: 1.0.0
+      placeholder: 1.0.0b
     validations:
       required: true
   - type: dropdown
@@ -54,10 +52,40 @@ body:
         - Linux (Tarball)
         - macOS - aarch64
         - macOS - Intel
-        - Windows
+        - Windows - x64
+        - Windows - aarch64
         - Other
     validations:
       required: true
+  - type: dropdown
+    id: component
+    attributes:
+      label: What component is this issue related to?
+      options:
+        - Other
+        - Compact Mode
+        - Workspaces
+        - Mods / Themes
+        - Glance
+        - URL Bar
+        - Tabs
+        - Split View
+        - Settings
+        - Privacy
+        - Performance
+        - Media Controler
+        - Tab unloading
+        - Tab Folders
+        - Keyboard Shortcuts
+        - Security
+        - Extensions
+        - Customizable UI / Toolbars
+        - Localization
+        - Bookmarks
+        - Sync
+    validations:
+      required: true
+
   - type: textarea
     id: logs
     attributes:

.github/advanced-issue-labeler.yml

@@ -0,0 +1,58 @@
+policy:
+  - section:
+      - id: [component]
+        label:
+          # Make sure it's in sync with the dropdown in the issue template
+          - name: 'component: sync'
+            keys: ['Sync']
+          - name: 'component: compact-mode'
+            keys: ['Compact Mode']
+          - name: 'component: workspaces'
+            keys: ['Workspaces']
+          - name: 'component: mods-themes'
+            keys: ['Mods / Themes']
+          - name: 'component: bookmarks'
+            keys: ['Bookmarks']
+          - name: 'component: glance'
+            keys: ['Glance']
+          - name: 'component: url-bar'
+            keys: ['URL Bar']
+          - name: 'component: tabs'
+            keys: ['Tabs']
+          - name: 'component: settings'
+            keys: ['Settings']
+          - name: 'component: privacy'
+            keys: ['Privacy']
+          - name: 'component: split-view'
+            keys: ['Split View']
+          - name: 'component: performance'
+            keys: ['Performance']
+          - name: 'component: media-controller'
+            keys: ['Media Controler']
+          - name: 'component: tab-unloading'
+            keys: ['Tab unloading']
+          - name: 'component: tab-folders'
+            keys: ['Tab Folders']
+          - name: 'component: keyboard-shortcuts'
+            keys: ['Keyboard Shortcuts']
+          - name: 'component: security'
+            keys: ['Security']
+          - name: 'component: extensions'
+            keys: ['Extensions']
+          - name: 'component: customizable-ui-toolbars'
+            keys: ['Customizable UI / Toolbars']
+          - name: 'component: localization'
+            keys: ['Localization']
+          - name: 'component: other'
+            keys: ['Other']
+
+      - id: [platform]
+        block-list: ['Other']
+        label:
+          # Make sure it's in sync with the dropdown in the issue template
+          - name: 'platform: linux'
+            keys: ['Linux (AppImage)', 'Linux (Flatpak)', 'Linux (Tarball)']
+          - name: 'platform: macOS'
+            keys: ['macOS - aarch64', 'macOS - Intel']
+          - name: 'platform: windows'
+            keys: ['Windows - x64', 'Windows - aarch64']

.github/workflows/build.yml

@@ -385,23 +385,23 @@ jobs:
           set -eux
           export ARCH=${{ matrix.arch }}
           UPINFO="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|desktop|latest|zen-$ARCH.AppImage.zsync"
-          rm AppDir/.DirIcon || true
-          cp configs/branding/${{ inputs.update_branch }}/logo128.png AppDir/usr/share/icons/hicolor/128x128/apps/zen.png
-          cp configs/branding/${{ inputs.update_branch }}/logo128.png AppDir/zen.png && ln -s zen.png AppDir/.DirIcon
+          rm build/AppDir/.DirIcon || true
+          cp configs/branding/${{ inputs.update_branch }}/logo128.png build/AppDir/usr/share/icons/hicolor/128x128/apps/zen.png
+          cp configs/branding/${{ inputs.update_branch }}/logo128.png build/AppDir/zen.png && ln -s zen.png build/AppDir/.DirIcon
 
           if [ "${{ inputs.update_branch }}" = "twilight" ]; then
-            sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' AppDir/zen.desktop
-            sed -i -e 's/StartupWMClass=zen/StartupWMClass=zen-twilight/g' AppDir/zen.desktop
+            sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' build/AppDir/zen.desktop
+            sed -i -e 's/StartupWMClass=zen/StartupWMClass=zen-twilight/g' build/AppDir/zen.desktop
           fi
 
-          APPDIR=AppDir
+          APPDIR=build/AppDir
           tar -xvf *.tar.* && rm -rf *.tar.*
           mv zen/* $APPDIR/
           wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
           wget "https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-squashfs-lite-$ARCH"
           chmod +x *.AppImage
           chmod +x ./uruntime-appimage-squashfs-lite-"$ARCH"
-          chmod +x ./AppDir/AppRun
+          chmod +x ./build/AppDir/AppRun
 
           # keep the uruntime mountpoint (massively speeds up launch time)
           sed -i 's|URUNTIME_MOUNT=[0-9]|URUNTIME_MOUNT=0|' ./uruntime-appimage-squashfs-lite-"$ARCH"
@@ -628,7 +628,7 @@ jobs:
           pwd
           ls .
           ls ..
-          mv releases.xml ./flatpak/app.zen_browser.zen.metainfo.xml
+          mv releases.xml ./build/flatpak/app.zen_browser.zen.metainfo.xml
           # output the version to the file
           echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version
 

.github/workflows/clear-cache.yml

@@ -1,33 +0,0 @@
-name: Clear cache
-
-on:
-  workflow_dispatch:
-
-permissions:
-  actions: write
-
-jobs:
-  clear-cache:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clear cache
-        uses: actions/github-script@v7
-        with:
-          script: |
-            console.log("About to clear")
-            const caches = await github.rest.actions.getActionsCacheList({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-            })
-
-            for (const cache of caches.data.actions_caches) {
-              console.log(cache)
-              await github.rest.actions.deleteActionsCacheById({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                cache_id: cache.id,
-              })
-            }
-
-            console.log("Clear completed")

.github/workflows/issue-labeler.yml

@@ -0,0 +1,34 @@
+name: Issue labeler
+on:
+  issues:
+    types: [opened]
+
+permissions:
+  contents: read
+
+jobs:
+  label-component:
+    runs-on: ubuntu-latest
+
+    permissions:
+      # required for all workflows
+      issues: write
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Parse issue form
+        uses: stefanbuck/github-issue-parser@v3
+        id: issue-parser
+        with:
+          template-path: .github/ISSUE_TEMPLATE/bug_report.yml
+
+      - name: Set labels based on animals field
+        uses: redhat-plumbers-in-action/advanced-issue-labeler@v2
+        with:
+          issue-form: ${{ steps.issue-parser.outputs.jsonString }}
+          token: ${{ secrets.DEPLOY_KEY }}