Merge branch 'master' into group_dependabot

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

.github/dependabot.yml

@@ -6,6 +6,7 @@ updates:
       interval: weekly
       day: saturday
       time: "10:00"
+    target-branch: master
     open-pull-requests-limit: 10
     versioning-strategy: increase
     reviewers:
@@ -20,6 +21,7 @@ updates:
       interval: weekly
       day: saturday
       time: "10:00"
+    target-branch: master
     open-pull-requests-limit: 10
     allow:
       - dependency-type: direct
@@ -42,3 +44,53 @@ updates:
       github_action-dependencies:
         patterns:
           - "*"
+    target-branch: master
+
+# As above, but for development-v6
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: weekly
+      day: saturday
+      time: "10:00"
+    target-branch: release/v6.0
+    open-pull-requests-limit: 10
+    versioning-strategy: increase
+    reviewers:
+      - "pi-hole/docs-maintainers"
+    groups:
+      npm-dependencies:
+        patterns:
+          - "*"
+  - package-ecosystem: pip
+    directory: "/"
+    schedule:
+      interval: weekly
+      day: saturday
+      time: "10:00"
+    target-branch: release/v6.0
+    open-pull-requests-limit: 10
+    allow:
+      - dependency-type: direct
+      - dependency-type: indirect
+    reviewers:
+      - "pi-hole/docs-maintainers"
+    groups:
+      pip-dependencies:
+        patterns:
+          - "*"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: weekly
+      day: saturday
+      time: "10:00"
+    reviewers:
+      - "pi-hole/docs-maintainers"
+    groups:
+      github_action-dependencies:
+        patterns:
+          - "*"
+    target-branch: release/v6.0

.github/workflows/calibreapp-image-actions.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.6.0
 
       - name: Compress Images
         uses: calibreapp/image-actions@1.1.0 # TODO: if they start using a tag like v1, switch to that

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v3.6.0
         with:
           fetch-depth: 0
 
@@ -29,7 +29,7 @@ jobs:
           cache: pip
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3.7.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version: "${{ env.NODE }}"
           cache: npm

.github/workflows/codespell.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     -
       name: Checkout repository
-      uses: actions/checkout@v3.5.3
+      uses: actions/checkout@v3.6.0
     -
       name: Spell-Checking
       uses: codespell-project/actions-codespell@master

.github/workflows/editorconfig-checker.yml

@@ -9,6 +9,6 @@ jobs:
     name: editorconfig-checker
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v3.6.0
       - uses: editorconfig-checker/action-editorconfig-checker@main
       - run: editorconfig-checker