From 858b3568c70980cde1b9875cf98c2995bcc027f3 Mon Sep 17 00:00:00 2001 From: Sergio Gasquez Date: Thu, 18 Jul 2024 14:40:04 +0200 Subject: [PATCH] ci: Update the conditions that trigger the CI workflows --- .github/workflows/ci.yml | 9 +-------- .github/workflows/hil.yml | 10 ++-------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea1d3742..7a414deb 100644 --- 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 index b5dd4222..69079f50 100644 --- 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