Merge remote-tracking branch 'origin/master'

# Conflicts:
#	io-package.json

.github/dependabot.yml

@@ -1,16 +1,20 @@
+# Dependabot will run on day 17 of each month at 02:15 (Europe/Berlin timezone)
 version: 2
 updates:
-  - package-ecosystem: github-actions
+
+  - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: monthly
+      interval: "cron"
-      time: "04:00"
+      timezone: "Europe/Berlin"
-      timezone: Europe/Berlin
+      cronjob: "15 2 17 * *"
-  - package-ecosystem: npm
+    open-pull-requests-limit: 15
+
+  - package-ecosystem: "npm"
     directory: "/"
     schedule:
-      interval: monthly
+      interval: "cron"
-      time: "04:00"
+      timezone: "Europe/Berlin"
-      timezone: Europe/Berlin
+      cronjob: "15 2 17 * *"
-    open-pull-requests-limit: 5
+    open-pull-requests-limit: 15
-    versioning-strategy: increase
+    versioning-strategy: "increase"

.github/workflows/automerge-dependabot.yml

@@ -0,0 +1,35 @@
+# Workflow for auto-merging Dependabot PRs
+# This workflow uses the action-automerge-dependabot action to automatically merge
+# Dependabot PRs based on the rules defined in .github/auto-merge.yml
+
+name: Auto-Merge Dependabot PRs
+
+on:
+  # Trigger when a PR is opened or updated
+  # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  auto-merge:
+    runs-on: ubuntu-latest
+    # Only run if actor is dependabot
+    if: github.actor == 'dependabot[bot]'
+    
+    permissions:
+      contents: write
+      pull-requests: write
+      
+    steps:
+      - name: Auto-merge Dependabot PRs
+        uses: iobroker-bot-orga/action-automerge-dependabot@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          # Optional: Path to your auto-merge configuration file
+          # config-file-path: '.github/auto-merge.yml'
+          # Optional: Merge method (merge, squash, or rebase)
+          # merge-method: 'squash'
+          # Optional: Wait for other checks to complete
+          # wait-for-checks: 'true'
+          # Optional: Maximum time to wait for checks in seconds (default: 3600)
+          # max-wait-time: '3600'

.github/workflows/codeql.yml

@@ -24,18 +24,18 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v4
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v4
         with:
           category: "/language:${{ matrix.language }}"

.gitignore

@@ -6,4 +6,7 @@ admin/i18n/flat.txt
 admin/i18n/*/flat.txt
 iob_npm.done
 package-lock.json
+#ignore .commitinfo created by ioBroker release script
+.commitinfo
 .claude/settings.local.json
+