Conversation
Add `repository.datadog.yaml` configuration to enable the Datadog merge queue with speculative workflow. This allows PRs to be validated against the latest base branch before merging, preventing conflicts and broken builds in high-velocity merges. The queue is restricted to `master` to avoid running on other branches. The All Green workflow is also excluded from merge queue working branches, where it serves no purpose. Configuration details: - Speculative workflow with fallback enabled - Up to 5 PRs validated in parallel - GitLab checks enabled with retry support - Fail-fast disabled to wait for full pipeline completion - Labels skipped to avoid triggering required status checks
Overall package sizeSelf size: 4.64 MB Dependency sizes| name | version | self size | total size | |------|---------|-----------|------------| | import-in-the-middle | 2.0.6 | 81.92 kB | 813.08 kB | | dc-polyfill | 0.1.10 | 26.73 kB | 26.73 kB |🤖 This report was automatically generated by heaviest-objects-in-the-universe |
This comment has been minimized.
This comment has been minimized.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #7561 +/- ##
==========================================
+ Coverage 80.15% 80.29% +0.13%
==========================================
Files 730 732 +2
Lines 31217 31468 +251
==========================================
+ Hits 25023 25267 +244
- Misses 6194 6201 +7 Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
BridgeAR
left a comment
There was a problem hiding this comment.
Should we allow to circumvent the merge queue with a reason similar to Python? I think that would be beneficial in case we need to unbreak the CI because something weird happened.
Or should we just admin merge in that case?
|
@BridgeAR I was thinking that we should just admin-merge in that case, similar to what we have done so far with the normal merge button |
|
If we later decide that it's better to do what the python tracer has done, we can always add it in. But I wanted to make this PR change as little of our current workflow as possible, to make it a less controversial change. |
Move merge queue settings into `repository.datadog.yml` and remove `repository.datadog.yaml`. PR #7561 added the config under the wrong extension even though the `.yml` file already existed.
Add `repository.datadog.yaml` configuration to enable the Datadog merge queue with speculative workflow. This allows PRs to be validated against the latest base branch before merging, preventing conflicts and broken builds in high-velocity merges. The queue is restricted to `master` to avoid running on other branches. Configuration details: - Speculative workflow with fallback enabled - Up to 5 PRs validated in parallel - GitLab checks enabled with retry support - Fail-fast disabled to wait for full pipeline completion - Labels skipped to avoid triggering required status checks
Add `repository.datadog.yaml` configuration to enable the Datadog merge queue with speculative workflow. This allows PRs to be validated against the latest base branch before merging, preventing conflicts and broken builds in high-velocity merges. The queue is restricted to `master` to avoid running on other branches. Configuration details: - Speculative workflow with fallback enabled - Up to 5 PRs validated in parallel - GitLab checks enabled with retry support - Fail-fast disabled to wait for full pipeline completion - Labels skipped to avoid triggering required status checks
Add `repository.datadog.yaml` configuration to enable the Datadog merge queue with speculative workflow. This allows PRs to be validated against the latest base branch before merging, preventing conflicts and broken builds in high-velocity merges. The queue is restricted to `master` to avoid running on other branches. Configuration details: - Speculative workflow with fallback enabled - Up to 5 PRs validated in parallel - GitLab checks enabled with retry support - Fail-fast disabled to wait for full pipeline completion - Labels skipped to avoid triggering required status checks

What does this PR do?
Adds
repository.datadog.yamlconfiguration to configure the Datadog merge queue with speculative workflow. It is heavily inspired by its dd-trace-py counterpart. This allows PRs to be validated against the latest base branch before merging, preventing conflicts and broken builds in high-velocity merges.The queue is restricted to
masterto avoid running on other branches.Configuration details:
Motivation
The merge queue helps prevent merge conflicts and broken builds by validating PRs against the latest base branch before merging, which is especially important in repositories with high merge velocity where multiple PRs may be merged in quick succession.
Additional Notes
For now, the merge queue isn't enforced, but opt-in. This allows us to test drive it, and only choose to enforce it if we decide the pros outweigh the cons.