Skip to content

Commit 53d451a

Browse files
authored
ci: run GHA on merge_group events (#15600)
## Description There is a specific event we have to trigger on to run CI during a Merge Queue group. ## Testing <!-- Describe your testing strategy or note what tests are included --> ## Risks <!-- Note any risks associated with this change, or "None" if no risks --> ## Additional Notes <!-- Any other information that would be helpful for reviewers -->
1 parent 113fac7 commit 53d451a

14 files changed

+15
-12
lines changed

.github/workflows/all-green.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: All Green
22
on:
33
pull_request:
4+
merge_group:
45

56
concurrency:
67
group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/build_deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
# TODO: Remove this after 3.x work is done
1515
- 3.x-staging
1616
pull_request:
17+
merge_group:
1718
release:
1819
types:
1920
- published

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- main
7-
- 'mq-working-branch**'
7+
merge_group:
88
pull_request:
99
# The branches below must be a subset of the branches above
1010
branches:

.github/workflows/django-overhead-profile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches:
55
- main
6-
- 'mq-working-branch**'
6+
merge_group:
77
pull_request:
88
paths:
99
- 'ddtrace/**'

.github/workflows/encoders-profile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches:
55
- main
6-
- 'mq-working-branch**'
6+
merge_group:
77
pull_request:
88
paths:
99
- 'ddtrace/internal/_encoding.pyx'

.github/workflows/flask-overhead-profile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches:
55
- main
6-
- 'mq-working-branch**'
6+
merge_group:
77
pull_request:
88
paths:
99
- 'ddtrace/**'

.github/workflows/import-analysis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Import analysis
22

33
on:
44
pull_request:
5+
merge_group:
56

67
jobs:
78
import_analysis:

.github/workflows/profiling-native.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- main
7-
- "mq-working-branch**"
7+
merge_group:
88
pull_request:
99
paths:
1010
- ddtrace/internal/datadog/profiling/**

.github/workflows/pytorch_gpu_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
name: Pytorch Unit Tests (with GPU)
1+
name: Pytorch Unit Tests (with GPU)
22

33
on:
44
push:
55
branches:
66
- 'main'
7-
- 'mq-working-branch**'
87
paths:
98
- 'ddtrace/profiling/collector/pytorch.py'
9+
merge_group:
1010
pull_request:
1111
paths:
1212
- 'ddtrace/profiling/collector/pytorch.py'
13-
workflow_dispatch:
13+
workflow_dispatch:
1414

1515
jobs:
1616
unit-tests:

.github/workflows/requirements-locks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches:
55
- main
6-
- 'mq-working-branch**'
6+
merge_group:
77
pull_request:
88
types: [opened, reopened, synchronize]
99

0 commit comments

Comments
 (0)