Skip to content

Commit 5f5016e

Browse files
authored
ci: prepare for using a merge-queue in pace (NOAA-GFDL#133)
Co-authored-by: Roman Cattaneo <>
1 parent 449bf4a commit 5f5016e

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.github/workflows/lint.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: "Lint"
2+
3+
# Run these these whenever ...
24
on:
3-
pull_request:
5+
pull_request: # ... a PR is opened / updated
6+
merge_group: # ... the PR is added to the merge queue
7+
push:
8+
branches:
9+
- main # ... when merging into the main branch
410

511
jobs:
612
lint:

.github/workflows/main_unit_tests.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: "pace main unit tests"
2+
3+
# Run these these whenever ...
24
on:
3-
workflow_call:
5+
workflow_call: # ... called from a downstream repo
46
inputs:
57
component_trigger:
68
type: boolean
@@ -10,8 +12,9 @@ on:
1012
type: string
1113
default: ''
1214
required: false
13-
pull_request:
14-
push:
15+
pull_request: # ... a PR is opened / updated
16+
merge_group: # ... the PR is added to the merge queue
17+
push: # ... code is pushed to any branch
1518

1619
# cancel running jobs if theres a newer push
1720
concurrency:

0 commit comments

Comments
 (0)