.github/workflows: run CI and CodeQL in the merge queue
Signed-off-by: David Anderson <danderson@tailscale.com>pull/7317/head
parent
149de5e6d6
commit
306c8a713c
|
@ -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'
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue