Skip to content

Commit

Permalink
Add merge group label to relevant branches.
Browse files Browse the repository at this point in the history
  • Loading branch information
fruffy committed Feb 23, 2024
1 parent e14d108 commit b37c5cc
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/ci-bazel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches: [ main ]
pull_request:
branches: [ main ]
merge_group:
branches: [ main ]

# Cancel any preceding run on the pull request.
concurrency:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-container-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
branches: [ main ]
pull_request:
branches: [ main ]
merge_group:
branches: [ main ]

schedule:
# Ideally, we would update the image every time the base image
# (p4lang/behavioral-model) is updated, this is good enough.
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches: [ main ]
pull_request:
branches: [ main ]
merge_group:
branches: [ main ]

jobs:
p4c-lint:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-p4tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches: [ main ]
pull_request:
branches: [ main ]
merge_group:
branches: [ main ]

# Cancel any preceding run on the pull request.
concurrency:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-ptf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ on:
branches: [ main ]
pull_request:
branches: [ main ]
merge_group:
branches: [ main ]

# Cancel any preceding run on the pull request.
concurrency:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci-static-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ on:
branches: [ main ]
pull_request:
branches: [ main ]

merge_group:
branches: [ main ]

# Cancel any preceding run on the pull request.
concurrency:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches: [ main ]
pull_request:
branches: [ main ]
merge_group:
branches: [ main ]

# Cancel any preceding run on the pull request.
concurrency:
Expand Down

0 comments on commit b37c5cc

Please sign in to comment.