From 234aefbdd07e502a8c77198a246e885e01922f84 Mon Sep 17 00:00:00 2001 From: aaronabbott Date: Wed, 20 May 2026 00:04:23 +0000 Subject: [PATCH] docs: document merge queue deadlock workaround and merge order Assisted-by: Gemini --- .github/workflows/ci.yml | 3 +++ .github/workflows/templates/ci.yml.j2 | 3 +++ RELEASING.md | 1 + 3 files changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4de35668a3..68cedf5584 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,6 +43,9 @@ jobs: - contrib runs-on: ubuntu-latest steps: + # Skip alls-green check for post-release version bumps in merge_group. + # This avoids a deadlock where core and contrib repos wait for each other's releases. + # See RELEASING.md for more details. - name: Decide whether the needed jobs succeeded or failed if: ${{ !(github.event_name == 'merge_group' && contains(github.event.merge_group.head_commit.message, 'Update version to')) }} uses: re-actors/alls-green@release/v1 diff --git a/.github/workflows/templates/ci.yml.j2 b/.github/workflows/templates/ci.yml.j2 index e34f6c117a..ac67f5b2f9 100644 --- a/.github/workflows/templates/ci.yml.j2 +++ b/.github/workflows/templates/ci.yml.j2 @@ -43,6 +43,9 @@ jobs: - contrib runs-on: ubuntu-latest steps: + # Skip alls-green check for post-release version bumps in merge_group. + # This avoids a deadlock where core and contrib repos wait for each other's releases. + # See RELEASING.md for more details. - name: Decide whether the needed jobs succeeded or failed if: ${% raw %}{{ !(github.event_name == 'merge_group' && contains(github.event.merge_group.head_commit.message, 'Update version to')) }}{% endraw %} uses: re-actors/alls-green@release/v1 diff --git a/RELEASING.md b/RELEASING.md index dc5cb33b33..f55886743c 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -14,6 +14,7 @@ * Release builds now should pass. * Merge the release PR. * Merge the PR to main (this can be done separately from [making the release](#making-the-release)) + * ⚠️ **Merge `core` first**: To avoid a merge queue deadlock with `contrib`, you must merge the `core` PR to `main` first. We skip `alls-green` in the core merge queue ([ci.yml](https://github.com/open-telemetry/opentelemetry-python/blob/main/.github/workflows/ci.yml)) for this PR, which unblocks `contrib` once merged. ## Preparing a new patch release