.github/workflows: run CI and CodeQL in the merge queue

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2023-02-18 11:06:41 -08:00 committed by Dave Anderson
parent 149de5e6d6
commit 306c8a713c
2 changed files with 2 additions and 0 deletions

View File

@ -17,6 +17,7 @@ on:
pull_request: pull_request:
# The branches below must be a subset of the branches above # The branches below must be a subset of the branches above
branches: [ main ] branches: [ main ]
merge_group:
schedule: schedule:
- cron: '31 14 * * 5' - cron: '31 14 * * 5'

View File

@ -24,6 +24,7 @@ on:
pull_request: pull_request:
branches: branches:
- "*" - "*"
merge_group:
concurrency: concurrency:
# For PRs, later CI runs preempt previous ones. e.g. a force push on a PR # For PRs, later CI runs preempt previous ones. e.g. a force push on a PR