Skip to content

MINOR: Set the POM SCM tag when preparing and publishing releases - #3933

Merged
wgtmac merged 1 commit into
apache:masterfrom
RussellSpitzer:fix/release-scm-tag
Nov 5, 2026
Merged

wgtmac merged 1 commit into
apache:masterfrom
RussellSpitzer:fix/release-scm-tag

Conversation

@RussellSpitzer

Copy link
Copy Markdown
Member

Rationale for this change

prepare-rc.sh only ran versions:set, so in the root POM kept whatever the release branch carried. The 1.18.2 RCs shipped apache-parquet-1.18.0-rc2 and the 1.19.0 RCs shipped HEAD.

What changes are included in this PR?

  • prepare-rc.sh writes the RC tag into in the release commit, including on rc1+ when the version is already set, and refuses to tag and deploy if the committed tag doesn't match.
  • publish-release.sh checks out the release branch before comparing it with the RC tag (the workflow is dispatched from master), and resets to HEAD in the next development iteration commit.

Are these changes tested?

Locally checked that we are correctly checking and creating poms correctly

Are there any user-facing changes?

No

prepare-rc.sh only ran versions:set, so <scm><tag> in the root POM kept
whatever the release branch carried. The 1.18.2 RCs shipped
apache-parquet-1.18.0-rc2 and the 1.19.0 RCs shipped HEAD.

- prepare-rc.sh writes the RC tag into <scm><tag> in the release commit,
  including on rc1+ when the version is already set, and refuses to tag
  and deploy if the committed tag doesn't match.
- publish-release.sh checks out the release branch before comparing it
  with the RC tag (the workflow is dispatched from master), and resets
  <scm><tag> to HEAD in the next development iteration commit.

@wgtmac wgtmac left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks @RussellSpitzer for fixing this! I also noticed that we cannot run publish-release successfully for 1.18.x without this fix.

@wgtmac
wgtmac merged commit aa59a9d into apache:master Nov 5, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants