From 31ca03cc902e008a9753b4d97ad129cc85275973 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:16:52 -0700 Subject: [PATCH] [chore] Try adding merge_group to more jobs (#31228) **Description:** The merge queue isn't working. Maybe it wants more jobs to be included? **Link to tracking Issue:** https://github.com/open-telemetry/community/issues/1936 --- .github/workflows/check-links.yaml | 1 + .github/workflows/e2e-tests.yml | 2 ++ .github/workflows/prometheus-compliance-tests.yml | 1 + 3 files changed, 4 insertions(+) diff --git a/.github/workflows/check-links.yaml b/.github/workflows/check-links.yaml index 83817d99f1f5..8d08e4b5931a 100644 --- a/.github/workflows/check-links.yaml +++ b/.github/workflows/check-links.yaml @@ -3,6 +3,7 @@ on: push: branches: [ main ] pull_request: + merge_group: # Do not cancel this workflow on main. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/16616 concurrency: diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 161a7df8953e..c7c554ada9be 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -7,6 +7,8 @@ on: tags: - 'v[0-9]+.[0-9]+.[0-9]+*' pull_request: + merge_group: + env: # Make sure to exit early if cache segment download times out after 2 minutes. # We limit cache download as a whole to 5 minutes. diff --git a/.github/workflows/prometheus-compliance-tests.yml b/.github/workflows/prometheus-compliance-tests.yml index 9c4d683aad1a..0cc65dca4269 100644 --- a/.github/workflows/prometheus-compliance-tests.yml +++ b/.github/workflows/prometheus-compliance-tests.yml @@ -5,6 +5,7 @@ on: tags: - 'v[0-9]+.[0-9]+.[0-9]+*' pull_request: + merge_group: # Do not cancel this workflow on main. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/16616 concurrency: