ci: Update the conditions that trigger the CI workflows

esp-rs · Jul 18, 2024 · 858b356 · 858b356
1 parent 44ba4d4
commit 858b356
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,16 +2,9 @@ name: CI
 
 on:
   pull_request:
-    branches:
-      - main
-    paths-ignore:
-      - "**/hil.yml"
-      - "**/*.md"
   push:
-    paths-ignore:
-      - "**/hil.yml"
-      - "**/*.md"
   workflow_dispatch:
+  merge_group:
 
 env:
   CARGO_TERM_COLOR: always

diff --git a/.github/workflows/hil.yml b/.github/workflows/hil.yml
@@ -2,15 +2,7 @@ name: HIL
 
 on:
   pull_request:
-    branches:
-      - main
-    paths-ignore:
-      - "**/ci.yml"
-      - "**/*.md"
   push:
-    paths-ignore:
-      - "**/ci.yml"
-      - "**/*.md"
   workflow_dispatch:
     inputs:
       repository:
@@ -21,6 +13,8 @@ on:
         description: "Branch, tag or SHA to checkout."
         required: true
         default: "main"
+  merge_group:
+
 env:
   CARGO_TERM_COLOR: always