Skip to content

fix(release): publish patches from git tags - #3338

Open
pratap0007 wants to merge 1 commit into
tektoncd:mainfrom
pratap0007:fix-14364
Open

pratap0007 wants to merge 1 commit into
tektoncd:mainfrom
pratap0007:fix-14364

Conversation

@pratap0007

Copy link
Copy Markdown
Contributor

Stop patch releases from committing VERSION and pushing the protected release-vX.Y.x branch. Tag the branch tip, push release-vX.Y.Z, and choose the next patch from the highest existing tag so an unmerged tag is not reused. make still injects clientVersion from ldflags.

Assisted-by: Grok 4.7 (via Cursor)

Changes

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

  • Includes tests (if functionality changed/added)
  • Run the code checkers with make check
  • Regenerate the manpages, docs and go formatting with make generated
  • Commit messages follow commit message best practices

See the contribution guide
for more details.

Release Notes

Stop patch releases from committing VERSION and pushing the
protected release-vX.Y.x branch. Tag the branch tip, push
release-vX.Y.Z, and choose the next patch from the highest
existing tag so an unmerged tag is not reused. make still
injects clientVersion from ldflags.

Signed-off-by: pratap0007 <shverma@redhat.com>
Assisted-by: Grok 4.7 (via Cursor)
Co-authored-by: Cursor <cursoragent@cursor.com>
@tekton-robot tekton-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Oct 13, 2026
@tekton-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please ask for approval from pratap0007 after the PR has been reviewed.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tekton-robot tekton-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 13, 2026
@pratap0007

Copy link
Copy Markdown
Contributor Author

/retest

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🟡 Changes recommended

Legacy VERSION files still override detected tags, causing Make builds to embed outdated client versions.

1 open finding
What changed in this PR

Moves patch releases toward tag-based versioning without updating protected maintenance branches.

Changes:

  • Stops committing VERSION during releases.
  • Adds git-derived version fallback for Make builds.
  • Selects patch numbers from the highest existing tag and pushes version-specific branches.
File Description
tekton/​release.sh Removes VERSION updates and release commits.
Makefile Adds git-tag fallback for client version injection.
.github/​workflows/​patch-release.yaml Updates patch numbering and tag/branch publication.

🧠 Review effort: Balanced


💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread Makefile
Comment on lines +38 to +40
VERSIONLDFLAG := -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=$(shell cat VERSION)
else ifneq ($(GIT_VERSION),)
VERSIONLDFLAG := -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=$(GIT_VERSION)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants