Merge branch 'master' into master

franzrammerstorfer · Dec 12, 2023 · 1abeee6 · 1abeee6
2 parents fe1dda9 + e8e091d
commit 1abeee6
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 19 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,3 +11,17 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "humble"
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "iron"
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -21,6 +21,7 @@ pull_request_rules:
     conditions:
       - conflict
       - author!=mergify[bot]
+      - author!=dependabot[bot]
     actions:
         comment:
           message: This pull request is in conflict. Could you fix it @{{author}}?
@@ -40,6 +41,7 @@ pull_request_rules:
       - author!=dstogl
       - author!=christophfroehlich
       - author!=mergify[bot]
+      - author!=dependabot[bot]
     actions:
         comment:
           message: |

diff --git a/.github/reviewer-lottery.yml b/.github/reviewer-lottery.yml
@@ -13,28 +13,21 @@ groups:
   - name: reviewers
     reviewers: 5
     usernames:
-      - rosterloh
-      - progtologist
+      - aprotyas
       - arne48
+      - bijoua29
       - christophfroehlich
       - DasRoteSkelett
-      - sgmurray
-      - harderthan
-      - jaron-l
-      - malapatiravi
+      - duringhof
       - erickisos
-      - sachinkum0009
-      - qiayuanliao
-      - homalozoa
-      - anfemosa
-      - jackcenter
-      - VX792
-      - mhubii
+      - fmauch
+      - jaron-l
       - livanov93
-      - aprotyas
+      - mcbed
+      - moriarty
+      - olivier-stasse
       - peterdavidfagan
-      - duringhof
+      - progtologist
+      - saikishor
       - VanshGehlot
-      - bijoua29
-      - LukasMacha97
-      - mcbed
+      - VX792
diff --git a/.github/workflows/ci-format.yml b/.github/workflows/ci-format.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-python@v4.7.1
+    - uses: actions/setup-python@v5.0.0
       with:
         python-version: '3.10'
     - name: Install system hooks