Skip to content

Commit

Permalink
ci: run pull request workflows for merge groups (#1809)
Browse files Browse the repository at this point in the history
If we want to enable a merge queue, we should have our CI also run on PR
that get added to the queue. If CI fails, the PR will be removed from
the queue. Right now we require a PR to be up-to-date with main, and
have green CI, before merging into main. This basically replicates that
requirement for merge queues.
  • Loading branch information
nsrip-dd committed Mar 16, 2023
1 parent 1de4e96 commit 68bff5f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 0 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/appsec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ on:
- 'internal/appsec/**'
- 'appsec/**'
- 'contrib/**/appsec.go'
merge_group: # on merge groups touching appsec files
paths:
- '.github/workflows/appsec.yml'
- 'internal/appsec/**'
- 'appsec/**'
- 'contrib/**/appsec.go'
push:
branches: release-v*
env:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
merge_group:

jobs:
analyze:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/parametric-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
pull_request:
branches:
- "**"
merge_group:
workflow_dispatch: {}
schedule:
- cron: '00 04 * * 2-6'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
branches:
- "**"
merge_group:

concurrency:
group: ${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/system-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
pull_request:
branches:
- "**"
merge_group:
workflow_dispatch: {}
schedule:
- cron: '00 04 * * 2-6'
Expand Down

0 comments on commit 68bff5f

Please sign in to comment.