From 48c9909758762c98cd8242192b493772edfc701b Mon Sep 17 00:00:00 2001 From: Tom McGuire Date: Wed, 28 Feb 2024 13:33:25 -0800 Subject: [PATCH] ci(merge-queue): add required trigger for github actions (#4998) ### Description Adds the required trigger for Github Action Merge Queue: [docs](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue#triggering-merge-group-checks-with-github-actions). ### Test plan - Test in CI. ### Related issues N/A ### Backwards compatibility Yes ### Network scalability N/A --- .github/workflows/check.yml | 3 ++- .github/workflows/e2e-pr.yml | 1 + .github/workflows/semantic-pr.yml | 1 + .github/workflows/test.yml | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 9a8c6f9e719..84bd8d4473b 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -5,9 +5,10 @@ on: push: branches: - main - # ..and any pull request. + # ..any pull request, workflow dispatch and merge queue pull_request: workflow_dispatch: + merge_group: # Cron job to run checks @ 8:30 pm daily on the latest commit on the default branch - main schedule: - cron: '30 20 * * *' diff --git a/.github/workflows/e2e-pr.yml b/.github/workflows/e2e-pr.yml index 7fe56a40ad2..342bd5ee377 100644 --- a/.github/workflows/e2e-pr.yml +++ b/.github/workflows/e2e-pr.yml @@ -3,6 +3,7 @@ on: pull_request: branches: - main + merge_group: # Cancel any in progress run of the workflow for a given PR # This avoids building outdated code diff --git a/.github/workflows/semantic-pr.yml b/.github/workflows/semantic-pr.yml index 320ecc5d94b..d785ec6450c 100644 --- a/.github/workflows/semantic-pr.yml +++ b/.github/workflows/semantic-pr.yml @@ -7,6 +7,7 @@ on: - reopened - edited - synchronize + merge_group: jobs: semantic-pr-title: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 52ed09e95b7..afdf84124eb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,8 +5,9 @@ on: push: branches: - main - # ..and any pull request. + # ..any pull request and merge queue pull_request: + merge_group: # Cancel any in progress run of the workflow for a given PR # This avoids building outdated code