fix(release): publish patches from git tags by pratap0007 · Pull Request #3338 · tektoncd/cli

pratap0007 · 2026-10-13T09:12:18Z

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

tekton-robot · 2026-10-13T09:12:23Z

[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:

OWNERS

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

pratap0007 · 2026-10-13T11:56:25Z

/retest

Copilot

🟡 Changes recommended

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

1 open finding

Prefer detected Git version over stale committed VERSION file · New

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.

pratap0007 · 2026-10-29T14:26:13Z

/retest

Copilot

🟡 Changes recommended

Release source archives lack Git metadata, so builds can report an outdated version or dev unless an archive-readable version fallback is preserved.

1 open issue

Preserve version metadata when building from release archives · New

1 resolved since last review

Prefer detected Git version over stale committed VERSION file

_{Review effort: Balanced}

+else ifneq (,$(wildcard ./VERSION))
+	VERSIONLDFLAG := -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=$(shell cat VERSION)


divyansh42 · 2026-11-02T04:59:03Z

@pratap0007 can we also delete those VERSION files from the release branches as well? I don't think it is required anymore.
Leaving it as it is might cause confusion in the future.

Swap version detection priority in Makefile to check GIT_VERSION first, falling back to VERSION file only when no git tag exists. Priority order: GIT_VERSION → VERSION file → RELEASE_VERSION Signed-off-by: pratap0007 <shverma@redhat.com> Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Release source archives downloaded from GitHub don't contain .git metadata, causing version detection to fail. Add git's export-subst mechanism to preserve tag information in archives. Creates .git_archival.txt with a $Format:%D$ placeholder that git-archive expands to include tag names. The Makefile now extracts the version from this file when git commands fail, ensuring correct version reporting when building from archives. Fixes: tektoncd#3338 (comment) Signed-off-by: pratap0007 <shverma@redhat.com> Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Copilot

🟡 Changes recommended

The archive version expression can silently select an older release tag when multiple tags share a commit, causing binaries from a newer source archive to report the wrong version.

2 open issues

_{Review effort: Balanced}

+
+# Extract version from .git_archival.txt (populated by git-archive export-subst)
+ARCHIVE_VERSION := $(shell if [ -f .git_archival.txt ]; then \
+	sed -n 's/^ref-names:.*tag: v\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/p' .git_archival.txt | head -n1; \


pratap0007 · 2026-11-02T13:14:54Z

/retest

pratap0007 · 2026-11-02T13:27:32Z

@pratap0007 can we also delete those VERSION files from the release branches as well? I don't think it is required anymore. Leaving it as it is might cause confusion in the future.

@divyansh42 should we delete later once patch release automation has been fixed?

divyansh42 · 2026-11-02T19:10:21Z

@pratap0007 can we also delete those VERSION files from the release branches as well? I don't think it is required anymore. Leaving it as it is might cause confusion in the future.

@divyansh42 should we delete later once patch release automation has been fixed?

Sure

Copilot

🟡 Changes recommended

Unresolved version-selection and release-workflow bugs can produce incorrectly versioned binaries and leave public release tags without triggering publication.

10 open issues

_{Review effort: Max}

@@ -0,0 +1 @@
+ref-names: $Format:%D$


-            if [ -z "$last_tag" ]; then
-              echo "::notice::Branch ${branch} has no tags — skipping (initial release handled by branch creation)"
+            # Latest release tag contained in this branch.
+            last_tag=$(git describe --tags --abbrev=0 --match "v${major}.${minor}.*" "$ref" 2>/dev/null || echo "")


+            # Next patch is one above the highest vX.Y.Z tag for this line.
+            # Tags that were pushed but never merged are invisible to describe,
+            # so v0.45.2 still advances to v0.45.3.
+            highest_tag=$(git tag -l "v${major}.${minor}.*" --sort=-v:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | head -1)


          git config user.email "tekton-robot@tektoncd.com"
-          git add VERSION
-          git commit -sm "New version ${RELEASE_VERSION}" || echo "No VERSION changes"
          git tag -a "${RELEASE_VERSION}" -m "Release ${RELEASE_VERSION}"


          git push origin "${RELEASE_VERSION}"
-          git push origin "HEAD:${{ matrix.release.branch }}"
+          git push origin "HEAD:release-${RELEASE_VERSION}"


+GIT_VERSION := $(shell tag=$$(git describe --tags --exact-match --match 'v[0-9]*.[0-9]*.[0-9]*' 2>/dev/null); \
+	if [ -z "$$tag" ]; then \
+		line=$$(git rev-parse --abbrev-ref HEAD 2>/dev/null | sed -n 's/^release-v\([0-9][0-9]*\.[0-9][0-9]*\)\.x$$/\1/p'); \
+		if [ -n "$$line" ]; then tag=$$(git describe --tags --abbrev=0 --match "v$$line.*" HEAD 2>/dev/null); fi; \
+	fi; printf '%s' "$$tag" | sed 's/^v//')


+
+# Extract version from .git_archival.txt (populated by git-archive export-subst)
+ARCHIVE_VERSION := $(shell if [ -f .git_archival.txt ]; then \
+	sed -n 's/^ref-names:.*tag: v\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/p' .git_archival.txt | head -n1; \


 git tag --sign -m \
    "New version ${RELEASE_VERSION}" \
    -m "${changelog}" --force ${RELEASE_VERSION}


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 requested review from divyansh42 and pradeepitm12 October 13, 2026 09:12

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

divyansh42 requested a balanced review from Copilot October 16, 2026 10:00

Copilot started reviewing on behalf of divyansh42 October 16, 2026 10:00

View session

Copilot AI reviewed Oct 16, 2026

View reviewed changes

Comment thread Makefile Resolved

pratap0007 force-pushed the fix-14364 branch from 3be028c to 6c39c47 Compare October 29, 2026 11:42

divyansh42 requested a balanced review from Copilot October 29, 2026 20:21

Copilot started reviewing on behalf of divyansh42 October 29, 2026 20:21

View session

Copilot AI reviewed Oct 29, 2026

View reviewed changes

Comment thread Makefile

Comment on lines +39 to +40

else ifneq (,$(wildcard ./VERSION))

VERSIONLDFLAG := -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=$(shell cat VERSION)

pratap0007 and others added 2 commits November 2, 2026 11:18

pratap0007 force-pushed the fix-14364 branch from 6c39c47 to 4de7c3b Compare November 2, 2026 12:41

divyansh42 requested a balanced review from Copilot November 2, 2026 12:44

Copilot started reviewing on behalf of divyansh42 November 2, 2026 12:44

View session

Copilot AI reviewed Nov 2, 2026

View reviewed changes

Comment thread Makefile

# Extract version from .git_archival.txt (populated by git-archive export-subst)

ARCHIVE_VERSION := $(shell if [ -f .git_archival.txt ]; then \

sed -n 's/^ref-names:.*tag: v$[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$.*/\1/p' .git_archival.txt | head -n1; \

divyansh42 requested a max review from Copilot November 4, 2026 11:09

Copilot started reviewing on behalf of divyansh42 November 4, 2026 11:10

View session

Copilot AI reviewed Nov 4, 2026

View reviewed changes

Navigation Menu

Repository navigation

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

fix(release): publish patches from git tags#3338
pratap0007 wants to merge 2 commits into
tektoncd:mainfrom
pratap0007:fix-14364

pratap0007 commented Oct 13, 2026

Uh oh!

tekton-robot commented Oct 13, 2026

Uh oh!

pratap0007 commented Oct 13, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

pratap0007 commented Oct 29, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

divyansh42 commented Nov 2, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

pratap0007 commented Nov 2, 2026

Uh oh!

pratap0007 commented Nov 2, 2026

Uh oh!

divyansh42 commented Nov 2, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		else ifneq (,$(wildcard ./VERSION))
		VERSIONLDFLAG := -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=$(shell cat VERSION)

Conversation

pratap0007 commented Oct 13, 2026

Changes

Submitter Checklist

Release Notes

Uh oh!

tekton-robot commented Oct 13, 2026

Uh oh!

pratap0007 commented Oct 13, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟡 Changes recommended

Uh oh!

Uh oh!

pratap0007 commented Oct 29, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟡 Changes recommended

Uh oh!

divyansh42 commented Nov 2, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟡 Changes recommended

Uh oh!

pratap0007 commented Nov 2, 2026

Uh oh!

pratap0007 commented Nov 2, 2026

Uh oh!

divyansh42 commented Nov 2, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

🟡 Changes recommended

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants