From 38da151a251de5b13afeedf9c5947707f87c5992 Mon Sep 17 00:00:00 2001 From: James Wainwright Date: Fri, 15 Dec 2023 11:45:56 +0000 Subject: [PATCH] [ci] Run CI in merge queue and not master This change updates the GitHub actions workflows to run on PR updates and within the GitHub merge queue, but not on the push to the master branch. Because we use merge queues, the re-run for the master branch would be redundant. Signed-off-by: James Wainwright --- .github/workflows/ci.yml | 5 +++-- .github/workflows/pr_lint.yml | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0fc5e902c..a62916b8ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,10 +8,11 @@ name: Ibex CI on: push: - branches: - - "*" tags: - "*" + merge_group: + types: + - checks_requested pull_request: branches: - "*" diff --git a/.github/workflows/pr_lint.yml b/.github/workflows/pr_lint.yml index d88689fa1a..91eeb1e497 100644 --- a/.github/workflows/pr_lint.yml +++ b/.github/workflows/pr_lint.yml @@ -10,7 +10,12 @@ name: pr-lint # Triggers when there is any activity on a pull request, e.g. opened, updated. on: + merge_group: + types: + - checks_requested pull_request: + branches: + - "*" jobs: verible-lint: