Skip to content

ci: separate patch, minor, and major version bumps#259

Merged
lmolkova merged 2 commits into
open-telemetry:mainfrom
MikeGoldsmith:mike/patch-release-fix
Jul 13, 2026
Merged

ci: separate patch, minor, and major version bumps#259
lmolkova merged 2 commits into
open-telemetry:mainfrom
MikeGoldsmith:mike/patch-release-fix

Conversation

@MikeGoldsmith

@MikeGoldsmith MikeGoldsmith commented Jul 13, 2026

Copy link
Copy Markdown
Member

Closes #258. Supersedes #252.

Post-release bump on main now always increments the beta patch component (X.YbN → X.Yb(N+1).dev), so Prepare release on main reliably ships the next patch. Minor and major bumps are now maintainer-led, via two new workflows.

Changes:

  • scripts/bump_package_dev_version.sh: drop the patch=0 → minor+1 special case; always bump patch.
  • New scripts/bump_package_minor_version.sh and bump_package_major_version.sh (accept .dev or non-.dev inputs).
  • New workflows bump-package-minor.yml and bump-package-major.yml that open a bump PR for a single package.
  • Renamed prepare-minor.ymlprepare-release.yml (the workflow always dropped .dev; the "minor" label was misleading now that main can be at any version type).
  • Renamed prepare-package-patch.ymlprepare-backport-patch.yml (this path is now backport-only; patch releases on main go through the normal Prepare release flow after the auto-bump lands).
  • Replaced .github/actions/prepare-package composite with .github/actions/bump-package, driven by an operation input (drop-dev | bump-patch | bump-minor | bump-major).
  • RELEASING.md updated to document the new model and workflow filenames.

Breaking: workflow filenames changed. PyPI trusted publisher entries reference the release workflows (release-package.yml, release-all.yml), which are unchanged, so no PyPI-side updates needed.

Relationship to #252: that PR patches the specific script-dispatch symptom by routing release_type=patch on main to prepare_package_for_patch_release.sh. This PR removes the "release_type on main" concept entirely by making patch bumps automatic and moving minor/major to dedicated workflows. If this PR lands, #252 can be closed as superseded. If #252 lands first, I'll rebase and keep the delete on prepare-package/action.yml (the new bump-package composite covers the same intent).

@MikeGoldsmith MikeGoldsmith added the Skip Changelog PR does not require a changelog entry label Jul 13, 2026
@MikeGoldsmith
MikeGoldsmith marked this pull request as ready for review July 13, 2026 14:01
@MikeGoldsmith
MikeGoldsmith requested a review from a team as a code owner July 13, 2026 14:01
Copilot AI review requested due to automatic review settings July 13, 2026 14:01

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the release automation to make post-release bumps on main always advance the beta patch (X.YbN → X.Yb(N+1).dev), and introduces maintainer-triggered workflows for explicit minor/major version line moves. This simplifies patch releases on main and makes minor/major transitions an explicit workflow-driven action.

Changes:

  • Adjusts the post-release dev bump script to always increment the patch component (including the patch==0 case).
  • Adds dedicated minor/major bump scripts and two new manual workflows to open bump PRs for a single package.
  • Renames workflows/docs and replaces the old prepare-package composite action with a new bump-package composite action driven by an operation input.

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
scripts/bump_package_minor_version.sh New script to bump a package to the next minor .dev version.
scripts/bump_package_major_version.sh New script to bump a package to the next major .dev version.
scripts/bump_package_dev_version.sh Changes dev bump logic to always bump patch after a release.
RELEASING.md Documents the new version cadence and updated workflow names/flows.
.github/workflows/prepare-release.yml Renames “Prepare minor release” to “Prepare release” (name/run-name).
.github/workflows/prepare-backport-patch.yml Renames workflow and switches to the new composite action + client-id inputs.
.github/workflows/bump-package-minor.yml New workflow to open a “bump minor” PR for a single package.
.github/workflows/bump-package-major.yml New workflow to open a “bump major” PR for a single package.
.github/actions/prepare-package/action.yml Removes the old composite action.
.github/actions/bump-package/action.yml Adds the new composite action that dispatches by operation.

Comment on lines +13 to +16
path="./$(./scripts/eachdist.py find-package --package "$package")"
version="$(./scripts/eachdist.py version --package "$package")"
version_file="$(find "$path" -type f -path "**/version.py")"

Comment on lines +13 to +16
path="./$(./scripts/eachdist.py find-package --package "$package")"
version="$(./scripts/eachdist.py version --package "$package")"
version_file="$(find "$path" -type f -path "**/version.py")"

Comment on lines 15 to 18
path="./$(./scripts/eachdist.py find-package --package "$package")"
version="$(./scripts/eachdist.py version --package "$package")"
version_file="$(find "$path" -type f -path "**/version.py")"

@opentelemetry-pr-dashboard

Copy link
Copy Markdown

This PR has review comments. Review suggestions, whether from maintainers or automated reviewers, aren't always correct or required. Please evaluate each comment on its merits, then make sure each thread has a clear outcome.

For example, link to the commit if you applied a suggestion, explain why it wasn't applied, or ask a follow-up question.

Automation flags a PR for human review once every review thread has a reply or is marked as resolved.

Status across open PRs is visible on the pull request dashboard.

@lmolkova
lmolkova added this pull request to the merge queue Jul 13, 2026
Merged via the queue into open-telemetry:main with commit 7473c38 Jul 13, 2026
85 checks passed
@MikeGoldsmith
MikeGoldsmith deleted the mike/patch-release-fix branch July 13, 2026 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Skip Changelog PR does not require a changelog entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Prepare-patch on main is unreliable after the post-release version bump

4 participants