Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/templates/ci.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading