.github/workflows: try to make the merge queue actually run CI
Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
committed by
Dave Anderson
parent
587eb32a83
commit
0ab6a7e7f5
@@ -18,6 +18,7 @@ on:
|
|||||||
# 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:
|
merge_group:
|
||||||
|
branches: [ main ]
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '31 14 * * 5'
|
- cron: '31 14 * * 5'
|
||||||
|
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- "*"
|
- "*"
|
||||||
merge_group:
|
merge_group:
|
||||||
|
branches:
|
||||||
|
- "main"
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user