Merge branch 'main' into run-workflow-release

jd · Feb 9, 2024 · 10825d2 · 10825d2
2 parents c56f6fd + cf58675
commit 10825d2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 32 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -35,12 +35,12 @@ jobs:
             tox: mypy
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
 
       - name: Setup Python 🔧
-        uses: actions/setup-python@v4.7.0
+        uses: actions/setup-python@v5.0.0
         with:
           python-version: ${{ matrix.python }}
           allow-prereleases: true

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
 
       - name: Setup Python 🔧
-        uses: actions/setup-python@v4.7.0
+        uses: actions/setup-python@v5.0.0
         with:
           python-version: 3.11
 

diff --git a/.mergify.yml b/.mergify.yml
@@ -1,6 +1,7 @@
 queue_rules:
   - name: default
-    conditions: &CheckRuns
+    merge_method: squash
+    queue_conditions: &CheckRuns
       - "check-success=test (3.8, py38)"
       - "check-success=test (3.9, py39)"
       - "check-success=test (3.10, py310)"
@@ -20,42 +21,28 @@ pull_request_rules:
           ⚠️ No release notes detected. Please make sure to use
           [reno](https://docs.openstack.org/reno/latest/user/usage.html) to add
           a changelog entry.
+
   - name: automatic merge without changelog
     conditions:
-      - and: *CheckRuns
-      - "#approved-reviews-by>=1"
-      - label=no-changelog
+      - or:
+        - author=jd
+        - author=dependabot[bot]
+        - "#approved-reviews-by>=1"
+      - or:
+        - label=no-changelog
+        - author=dependabot[bot]
     actions:
       queue:
-        name: default
-        method: squash
+
   - name: automatic merge with changelog
     conditions:
-      - and: *CheckRuns
-      - "#approved-reviews-by>=1"
-      - files~=^releasenotes/notes/
-    actions:
-      queue:
-        name: default
-        method: squash
-  - name: automatic merge for jd without changelog
-    conditions:
-      - author=jd
-      - and: *CheckRuns
-      - label=no-changelog
-    actions:
-      queue:
-        name: default
-        method: squash
-  - name: automatic merge for jd with changelog
-    conditions:
-      - author=jd
-      - and: *CheckRuns
+      - or:
+        - author=jd
+        - "#approved-reviews-by>=1"
       - files~=^releasenotes/notes/
     actions:
       queue:
-        name: default
-        method: squash
+
   - name: dismiss reviews
     conditions: []
     actions: