Merge pull request #163 from rust-embedded/merge-queue

Merge queue
rust-embedded · Oct 2, 2023 · 5ad2e00 · 5ad2e00
2 parents 1ffaf7c + 012538e
commit 5ad2e00
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/.github/bors.toml b/.github/bors.toml
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -5,10 +5,20 @@ env:
 
 on:
   push:
-    branches: [ staging, trying, master ]
+    branches: master
   pull_request:
+  merge_group:
 
 jobs:
+  python-ci:
+    name: Python-CI
+    runs-on: ubuntu-latest
+    needs: [test, check]
+    if: always()
+    steps:
+      - name: Done
+        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
+
   test:
     name: Test
     runs-on: ubuntu-latest

diff --git a/.github/workflows/rust-ci.yaml b/.github/workflows/rust-ci.yaml
@@ -5,10 +5,20 @@ env:
 
 on:
   push:
-    branches: [ staging, trying, master ]
+    branches: master
   pull_request:
+  merge_group:
 
 jobs:
+  rust-ci:
+    name: Rust-CI
+    runs-on: ubuntu-latest
+    needs: [build, test, test_convert, clippy, format, check]
+    if: always()
+    steps:
+      - name: Done
+        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
+
   build:
     name: Build
     runs-on: ubuntu-latest