From 30f40dbd0e8bc44d84f76d38466fdb0fb1a6780b Mon Sep 17 00:00:00 2001 From: erikayasuda <153395705+erikayasuda@users.noreply.github.com> Date: Wed, 4 Sep 2024 17:19:54 -0500 Subject: [PATCH] chore: add merge_group as a trigger for status checks (#10510) ## Checklist - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) --- .github/workflows/build_deploy.yml | 4 ++++ .github/workflows/build_python_3.yml | 4 ++++ .github/workflows/codeql-analysis.yml | 4 ++++ .github/workflows/django-overhead-profile.yml | 4 ++++ .github/workflows/encoders-profile.yml | 4 ++++ .github/workflows/flask-overhead-profile.yml | 4 ++++ .github/workflows/pypa_musllinux_1_2_i686.yml | 4 ++++ .github/workflows/requirements-locks.yml | 4 ++++ .github/workflows/rust-ci.yml | 4 ++++ .github/workflows/system-tests.yml | 4 ++++ .github/workflows/test_frameworks.yml | 4 ++++ .github/workflows/testrunner.yml | 4 ++++ .github/workflows/unit_tests.yml | 4 ++++ 13 files changed, 52 insertions(+) diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml index c71c3db7ebd..2f81e6a492b 100644 --- a/.github/workflows/build_deploy.yml +++ b/.github/workflows/build_deploy.yml @@ -11,6 +11,10 @@ on: - build_deploy* - 'upgrade-latest-*' pull_request: + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] release: types: - published diff --git a/.github/workflows/build_python_3.yml b/.github/workflows/build_python_3.yml index 05face7dc69..5878444c16a 100644 --- a/.github/workflows/build_python_3.yml +++ b/.github/workflows/build_python_3.yml @@ -1,6 +1,10 @@ name: Build Python 3 on: + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] workflow_call: inputs: cibw_build: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 960b2a21036..db67e7e499b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -8,6 +8,10 @@ on: # The branches below must be a subset of the branches above branches: - main + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] jobs: analyze: diff --git a/.github/workflows/django-overhead-profile.yml b/.github/workflows/django-overhead-profile.yml index 602d1302976..e1465f5bfbf 100644 --- a/.github/workflows/django-overhead-profile.yml +++ b/.github/workflows/django-overhead-profile.yml @@ -8,6 +8,10 @@ on: - 'ddtrace/**' - 'scripts/profiles/django-simple/**' - '.github/workflows/django-overhead-profile.yml' + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] jobs: django-overhead-profile: runs-on: ubuntu-latest diff --git a/.github/workflows/encoders-profile.yml b/.github/workflows/encoders-profile.yml index d95612b43c7..80cb48e71d8 100644 --- a/.github/workflows/encoders-profile.yml +++ b/.github/workflows/encoders-profile.yml @@ -8,6 +8,10 @@ on: - 'ddtrace/internal/_encoding.pyx' - 'scripts/profiles/encoders/**' - '.github/workflows/encoders-profile.yml' + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] jobs: encoders-profile: runs-on: ubuntu-latest diff --git a/.github/workflows/flask-overhead-profile.yml b/.github/workflows/flask-overhead-profile.yml index 4b9d6117701..ba5d2cf135c 100644 --- a/.github/workflows/flask-overhead-profile.yml +++ b/.github/workflows/flask-overhead-profile.yml @@ -8,6 +8,10 @@ on: - 'ddtrace/**' - 'scripts/profiles/flask-simple/**' - '.github/workflows/flask-overhead-profile.yml' + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] jobs: flask-overhead-profile: runs-on: ubuntu-latest diff --git a/.github/workflows/pypa_musllinux_1_2_i686.yml b/.github/workflows/pypa_musllinux_1_2_i686.yml index 601f0fbff51..7002ae8ba41 100644 --- a/.github/workflows/pypa_musllinux_1_2_i686.yml +++ b/.github/workflows/pypa_musllinux_1_2_i686.yml @@ -7,6 +7,10 @@ on: - 'main' paths: - 'docker/**' + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] jobs: build-and-publish: diff --git a/.github/workflows/requirements-locks.yml b/.github/workflows/requirements-locks.yml index fece6261a1a..e7c5f8f751e 100644 --- a/.github/workflows/requirements-locks.yml +++ b/.github/workflows/requirements-locks.yml @@ -5,6 +5,10 @@ on: - main pull_request: types: [opened, reopened, synchronize] + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] jobs: validate: name: Check requirements lockfiles diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml index 668aa507f89..dc87bc28c1c 100644 --- a/.github/workflows/rust-ci.yml +++ b/.github/workflows/rust-ci.yml @@ -4,6 +4,10 @@ on: pull_request: paths: - src/** + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] jobs: check: diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index ee73ec62454..49f4e43db6e 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -8,6 +8,10 @@ on: workflow_dispatch: {} schedule: - cron: '00 04 * * 2-6' + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] jobs: needs-run: diff --git a/.github/workflows/test_frameworks.yml b/.github/workflows/test_frameworks.yml index 4af5de67885..c56c0cc269a 100644 --- a/.github/workflows/test_frameworks.yml +++ b/.github/workflows/test_frameworks.yml @@ -5,6 +5,10 @@ on: branches: - main pull_request: + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/testrunner.yml b/.github/workflows/testrunner.yml index 816db70d6e8..83285216d6e 100644 --- a/.github/workflows/testrunner.yml +++ b/.github/workflows/testrunner.yml @@ -7,6 +7,10 @@ on: - 'main' paths: - 'docker/**' + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] jobs: build-and-publish: diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 4eac68c069b..c1a0503b314 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -6,6 +6,10 @@ on: - main pull_request: workflow_dispatch: {} + merge_group: + # Trigger jobs when PR is added to merge queue + branches: ['test-mq-main'] + types: [checks_requested] jobs: unit-tests: