Merge branch 'develop' into release; Bump to 6.7.1

ferdium · Mar 10, 2024 · f1f0256 · f1f0256
2 parents 2f449ce + 1c176d7
commit f1f0256
Show file tree

Hide file tree

Showing 60 changed files with 1,434 additions and 1,068 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -2965,6 +2965,24 @@
         "code",
         "infra"
       ]
+    },
+    {
+      "login": "xduugu",
+      "name": "xduugu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1039174?v=4",
+      "profile": "https://github.com/xduugu",
+      "contributions": [
+        "infra"
+      ]
+    },
+    {
+      "login": "dutscher",
+      "name": "Willy Woitas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/14682?v=4",
+      "profile": "http://www.willy-woitas.de",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "commitType": "docs"

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,11 +1,11 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
 version: 2
 updates:
   - package-ecosystem: "npm" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: "daily"
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -40,24 +40,24 @@ jobs:
       should_run: ${{ steps.should_run.outputs.should_run }}
     steps:
       - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
         with:
           ref: nightly
           submodules: recursive
           fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
       - name: Use Node.js specified in the '.nvmrc' file
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
         with:
           node-version-file: '.nvmrc'
           cache: 'pnpm'
       - name: Install node dependencies
         if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
-        uses: nick-fields/retry@v2.8.3
+        uses: nick-fields/retry@v3
         with:
           command: pnpm i
           timeout_minutes: 15
@@ -141,14 +141,14 @@ jobs:
           echo "ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder" >> $GITHUB_ENV
           echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV
       - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }}
         with:
           submodules: recursive
           fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
           ref: nightly
       - name: Checkout code along with submodules for any branch if the trigger event is NOT 'scheduled' and this is NOT a forced rebuild on the nightly branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }}
         with:
           submodules: recursive
@@ -157,28 +157,28 @@ jobs:
         run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
         shell: bash
       - name: Cache electron modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-electron-modules
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('./pnpm-lock.yaml') }}
           path: ${{ env.ELECTRON_CACHE }}
       - name: Cache electron-builder modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-electron-builder-modules
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('./pnpm-lock.yaml') }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
       - name: Use Node.js specified in the '.nvmrc' file
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'pnpm'
       - name: Install node dependencies
-        uses: nick-fields/retry@v2.8.3
+        uses: nick-fields/retry@v3
         with:
           command: pnpm i
           timeout_minutes: 15
@@ -220,14 +220,14 @@ jobs:
           echo "ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder" >> $GITHUB_ENV
           echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV
       - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }}
         with:
           submodules: recursive
           fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
           ref: nightly
       - name: Checkout code along with submodules for any branch if the trigger event is NOT 'scheduled' and this is NOT a forced rebuild on the nightly branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }}
         with:
           submodules: recursive
@@ -236,28 +236,28 @@ jobs:
         run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
         shell: bash
       - name: Cache electron modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-electron-modules
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('./pnpm-lock.yaml') }}
           path: ${{ env.ELECTRON_CACHE }}
       - name: Cache electron-builder modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-electron-builder-modules
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('./pnpm-lock.yaml') }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
       - name: Use Node.js specified in the '.nvmrc' file
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'pnpm'
       - name: Install node dependencies
-        uses: nick-fields/retry@v2.8.3
+        uses: nick-fields/retry@v3
         with:
           command: pnpm i
           timeout_minutes: 15
@@ -320,14 +320,14 @@ jobs:
           echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV
         shell: bash
       - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }}
         with:
           submodules: recursive
           fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
           ref: nightly
       - name: Checkout code along with submodules for any branch if the trigger event is NOT 'scheduled' and this is NOT a forced rebuild on the nightly branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }}
         with:
           submodules: recursive
@@ -336,23 +336,23 @@ jobs:
         run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
         shell: bash
       - name: Cache electron modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-electron-modules
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('./pnpm-lock.yaml') }}
           path: ${{ env.ELECTRON_CACHE }}
       - name: Cache electron-builder modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-electron-builder-modules
         with:
           key: ${{ runner.os }}-${{ env.cache-name }}-${{ secrets.CACHE_VERSION }}-${{ hashFiles('./pnpm-lock.yaml') }}
           path: ${{ env.ELECTRON_BUILDER_CACHE }}
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
       - name: Use Node.js specified in the '.nvmrc' file
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'pnpm'
@@ -365,7 +365,7 @@ jobs:
           sed -i 's/\/usr\/bin\/env node/node/g' "$PNPM_BASEDIR/pnpm/bin/pnpm.cjs"
         shell: bash
       - name: Install node dependencies
-        uses: nick-fields/retry@v2.8.3
+        uses: nick-fields/retry@v3
         with:
           command: pnpm i
           timeout_minutes: 15

diff --git a/.github/workflows/homebrew-cask-updates.yml b/.github/workflows/homebrew-cask-updates.yml
@@ -8,41 +8,41 @@ on:
 
 jobs:
   bump-casks:
-    runs-on: macos-latest
+    runs-on: macos-12
     steps:
-    - name: Publish nightly
-      uses: macauley/action-homebrew-bump-cask@v1
-      if: ${{ contains(github.event.release.tag_name, 'nightly') }}
-      with:
-        # Required, custom GitHub access token with only the 'public_repo' scope enabled
-        token: ${{ secrets.HOMEBREW_FERDIUM_PUBLISH_TOKEN }}
-        # Bump all outdated casks in this tap
-        tap: ferdium/homebrew-ferdium
-        # Bump only these casks if outdated
-        cask: ferdium-nightly
-        livecheck: true
-        dryrun: false
-    - name: Publish beta
-      uses: macauley/action-homebrew-bump-cask@v1
-      if: ${{ contains(github.event.release.tag_name, 'beta') }}
-      with:
-        # Required, custom GitHub access token with only the 'public_repo' scope enabled
-        token: ${{ secrets.HOMEBREW_FERDIUM_PUBLISH_TOKEN }}
-        # Bump all outdated casks in this tap
-        tap: ferdium/homebrew-ferdium
-        # Bump only these casks if outdated
-        cask: ferdium-beta
-        livecheck: true
-        dryrun: false
-    - name: Publish release
-      uses: macauley/action-homebrew-bump-cask@v1
-      if: ${{ !contains(github.event.release.tag_name, 'nightly') && !contains(github.event.release.tag_name, 'beta') }}
-      with:
-        # Required, custom GitHub access token with only the 'public_repo' scope enabled
-        token: ${{ secrets.HOMEBREW_FERDIUM_PUBLISH_TOKEN }}
-        # Bump all outdated casks in this tap
-        tap: ferdium/homebrew-ferdium
-        # Bump only these casks if outdated
-        cask: ferdium
-        livecheck: true
-        dryrun: false
+      - name: Publish nightly
+        uses: macauley/action-homebrew-bump-cask@v1
+        if: ${{ contains(github.event.release.tag_name, 'nightly') }}
+        with:
+          # Required, custom GitHub access token with only the 'public_repo' scope enabled
+          token: ${{ secrets.HOMEBREW_FERDIUM_PUBLISH_TOKEN }}
+          # Bump all outdated casks in this tap
+          tap: ferdium/homebrew-ferdium
+          # Bump only these casks if outdated
+          cask: ferdium-nightly
+          livecheck: true
+          dryrun: false
+      - name: Publish beta
+        uses: macauley/action-homebrew-bump-cask@v1
+        if: ${{ contains(github.event.release.tag_name, 'beta') }}
+        with:
+          # Required, custom GitHub access token with only the 'public_repo' scope enabled
+          token: ${{ secrets.HOMEBREW_FERDIUM_PUBLISH_TOKEN }}
+          # Bump all outdated casks in this tap
+          tap: ferdium/homebrew-ferdium
+          # Bump only these casks if outdated
+          cask: ferdium-beta
+          livecheck: true
+          dryrun: false
+      - name: Publish release
+        uses: macauley/action-homebrew-bump-cask@v1
+        if: ${{ !contains(github.event.release.tag_name, 'nightly') && !contains(github.event.release.tag_name, 'beta') }}
+        with:
+          # Required, custom GitHub access token with only the 'public_repo' scope enabled
+          token: ${{ secrets.HOMEBREW_FERDIUM_PUBLISH_TOKEN }}
+          # Bump all outdated casks in this tap
+          tap: ferdium/homebrew-ferdium
+          # Bump only these casks if outdated
+          cask: ferdium
+          livecheck: true
+          dryrun: false
diff --git a/.github/workflows/reddit.yml b/.github/workflows/reddit.yml
@@ -6,17 +6,17 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Release for Reddit
-        uses: bluwy/release-for-reddit-action@v1.2.0
+        uses: bluwy/release-for-reddit-action@v2
         with:
           username: ${{ secrets.REDDIT_USERNAME }}
           password: ${{ secrets.REDDIT_PASSWORD }}
           app-id: ${{ secrets.REDDIT_APP_ID }}
           app-secret: ${{ secrets.REDDIT_APP_SECRET }}
           subreddit: ferdium # Submit to /r/ferdium
-          title: "[Release] Ferdium ${{ github.event.release.tag_name }}"
+          title: '[Release] Ferdium ${{ github.event.release.tag_name }}'
           # flair-id: "7aa4f288-bf0d-11ec-a939-8e36666e1f23"
-          comment: "${{ github.event.release.body }}"
+          comment: '${{ github.event.release.body }}'
           notification: true
diff --git a/.github/workflows/tag-repos.yml b/.github/workflows/tag-repos.yml
@@ -8,27 +8,27 @@ on:
 
 jobs:
   tag-repos:
-    runs-on: macos-latest
+    runs-on: macos-12
     steps:
-    - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'release'
-      uses: actions/checkout@v3
-      if: ${{ contains(github.event.release.tag_name, 'nightly') || (github.event_name == 'workflow_dispatch') }}
-      with:
-        ref: nightly
-        submodules: recursive
-        fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
-    - name: Checkout code along with submodules for the 'release' branch if the trigger event is 'release'
-      uses: actions/checkout@v3
-      if: ${{ !contains(github.event.release.tag_name, 'nightly') }}
-      with:
-        ref: release
-        submodules: recursive
-        fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
-    - name: Extract Git tag name from the currently checked out branch (not from the branch where this run was kicked off)
-      run: |
-        TAG_NAME=$(node -p 'require("./package.json").version')
-        echo "TAG_NAME=v$TAG_NAME" >> $GITHUB_ENV
-      shell: bash
+      - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'release'
+        uses: actions/checkout@v4
+        if: ${{ contains(github.event.release.tag_name, 'nightly') || (github.event_name == 'workflow_dispatch') }}
+        with:
+          ref: nightly
+          submodules: recursive
+          fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
+      - name: Checkout code along with submodules for the 'release' branch if the trigger event is 'release'
+        uses: actions/checkout@v4
+        if: ${{ !contains(github.event.release.tag_name, 'nightly') }}
+        with:
+          ref: release
+          submodules: recursive
+          fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging
+      - name: Extract Git tag name from the currently checked out branch (not from the branch where this run was kicked off)
+        run: |
+          TAG_NAME=$(node -p 'require("./package.json").version')
+          echo "TAG_NAME=v$TAG_NAME" >> $GITHUB_ENV
+        shell: bash
     # Note: commented out the tagging of the main repo - since that is auto-created when a new release is published
     # - name: Tag the main repo
     #   run: |