Merge branch 'main' into develop

.github/dependabot.yml

@@ -1,11 +1,16 @@
 version: 2
 updates:
 
+  # Check for updates to GitHub Actions every week
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
   # composer updates
   - package-ecosystem: "composer"
     directory: "/" # Location of package manifests
     target-branch: develop
-    labels: [ "bug" ]
     versioning-strategy: increase
     schedule:
       interval: "weekly"
@@ -14,15 +19,6 @@ updates:
   - package-ecosystem: "npm"
     directory: "/"
     target-branch: develop
-    labels: [ "bug" ]
-    versioning-strategy: increase
-    schedule:
-      interval: "weekly"
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: develop
-    labels: [ "bug" ]
     versioning-strategy: increase
     schedule:
       interval: "weekly"

.github/workflows/cleanup.yml

@@ -12,7 +12,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Prune cancelled/skipped runs
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
           script: |
@@ -42,7 +42,7 @@ jobs:
             }
 
       - name: Prune runs older than 3 days
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
           script: |

.github/workflows/depsreview.yml

@@ -9,8 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: 'Dependency review'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4

.github/workflows/release.yml

@@ -51,7 +51,7 @@ jobs:
           CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
       - name: Cleanup translations
         id: cleanup-transactions
-        uses: JC5/firefly-iii-dev@v16
+        uses: JC5/firefly-iii-dev@v29
         with:
           action: 'ff3:crowdin-warning'
           output: ''
@@ -60,16 +60,25 @@ jobs:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
       - name: Cleanup changelog
         id: cleanup-changelog
-        uses: JC5/firefly-iii-dev@v16
+        uses: JC5/firefly-iii-dev@v29
         with:
           action: 'ff3:changelog'
           output: ''
         env:
           FIREFLY_III_ROOT: /github/workspace
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      - name: Extract changelog
+        id: extract-changelog
+        uses: JC5/firefly-iii-dev@v29
+        with:
+          action: 'ff3:extract-changelog'
+          output: 'output'
+        env:
+          FIREFLY_III_ROOT: /github/workspace
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
       - name: Generate JSON v1
         id: json-v1
-        uses: JC5/firefly-iii-dev@v16
+        uses: JC5/firefly-iii-dev@v29
         with:
           action: 'ff3:json-translations v1'
           output: ''
@@ -78,7 +87,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
       - name: Generate JSON v2
         id: json-v2
-        uses: JC5/firefly-iii-dev@v16
+        uses: JC5/firefly-iii-dev@v29
         with:
           action: 'ff3:json-translations v2'
           output: ''
@@ -87,7 +96,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
       - name: Code cleanup
         id: code-cleanup
-        uses: JC5/firefly-iii-dev@v16
+        uses: JC5/firefly-iii-dev@v29
         with:
           action: 'ff3:code'
           output: ''
@@ -100,7 +109,7 @@ jobs:
           npm run build
       - name: Build old JS
         id: old-js
-        uses: JC5/firefly-iii-dev@v16
+        uses: JC5/firefly-iii-dev@v29
         with:
           action: 'ff3:old-js'
           output: ''
@@ -126,19 +135,25 @@ jobs:
           fi
 
           git add -A
+          if test -f "output.txt"; then
+            git reset output.txt
+          fi
           git commit -m "Auto commit for release '$version' on $(date +'%Y-%m-%d')" || true
           git push
 
           if [[ "develop" == "$version" ]]; then
             echo "Create nightly release."
-            git tag -a $version-$(date +'%Y%m%d') -m "Release '$version' on $(date +'%Y-%m-%d')"
+            git tag -a $version-$(date +'%Y%m%d') -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
             git push origin $version-$(date +'%Y%m%d')
-            gh release create $version-$(date +'%Y%m%d') -p -t "Nightly dev-release $(date +'%Y-%m-%d')" --verify-tag
+            gh release create $version-$(date +'%Y%m%d') -p --verify-tag \
+              -t "Development release for $(date +'%Y-%m-%d')" \
+              -n "Bi-weekly development release of Firefly III with the latest fixes, translations and features. This release was created on **$(date +'%Y-%m-%d')** and may contain bugs. Use at your own risk. Docker users can find this release under the `develop` tag."
           else
             echo "Create default release."
             git tag -a $version -m "Here be changelog"
             git push origin $version
-            gh release create $version --notes-from-tag -t "$version" --verify-tag
+            gh release create $version -F output.txt -t "$version" --verify-tag
+            rm -f output.txt
             git checkout develop
             git merge main
             git push

.github/workflows/stale.yml

@@ -1,4 +1,4 @@
-name: "Issues - Close stale issues"
+name: "Issues - Mark and close stale issues"
 on:
   schedule:
     - cron: "30 1 * * *"
@@ -14,21 +14,25 @@ jobs:
       pull-requests: write  # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: >
-            Hi there! This is an automatic reply. `Share and enjoy`
+            Hi there! 
+            
+            This is an automatic reply. `Share and enjoy`
 
             This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.
 
             Thank you for your contributions.
           stale-pr-message: >
-            Hi there! This is an automatic reply. `Share and enjoy`
+            Hi there! 
+            
+            This is an automatic reply. `Share and enjoy`
 
             This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.
 
             Thank you for your contributions.
           days-before-stale: 14
           days-before-close: 7
-          exempt-issue-labels: 'enhancement,feature,bug,announcement,epic'
+          exempt-issue-labels: 'enhancement,feature,bug,announcement,epic,triage'