Skip to content

fix(ci): use main's tooling for release branch bumps#3663

Open
theakshaypant wants to merge 1 commit into
tektoncd:mainfrom
theakshaypant:ci/fix-bump-on-releases
Open

fix(ci): use main's tooling for release branch bumps#3663
theakshaypant wants to merge 1 commit into
tektoncd:mainfrom
theakshaypant:ci/fix-bump-on-releases

Conversation

@theakshaypant

Copy link
Copy Markdown
Member

Changes

The bump-payload-on-releases workflow was failing on older release branches (e.g. release-v0.74.x) because the generate-bump-message.sh script does not exist on those branches. The workflow now checks out main first to build the operator tool binary and cache the script, then checks out the release branch for the actual bump. This ensures consistent tooling regardless of branch age.

Submitter Checklist

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

See the contribution guide for more details.

Release Notes

NONE

The bump-payload-on-releases workflow was failing on older
release branches (e.g. release-v0.74.x) because the
generate-bump-message.sh script does not exist on those
branches. The workflow now checks out main first to build
the operator tool binary and cache the script, then checks
out the release branch for the actual bump. This ensures
consistent tooling regardless of branch age.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Akshay Pant <akpant@redhat.com>
@tekton-robot tekton-robot added the release-note-none Denotes a PR that doesnt merit a release note. label Jul 6, 2026
@tekton-robot tekton-robot requested review from khrm and pramodbindal July 6, 2026 10:30
@tekton-robot tekton-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 6, 2026

@vdemeester vdemeester 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.

Ah interesting.. but won't the 2 checkout be conflicting ?

@tekton-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vdemeester

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

The pull request process is described 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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 6, 2026
@theakshaypant

Copy link
Copy Markdown
Member Author

Ah interesting.. but won't the 2 checkout be conflicting ?

No conflict, the second actions/checkout overwrites the workspace. When checkout runs against the same path (default $GITHUB_WORKSPACE), it does:

| [command]/usr/bin/git checkout --detach
| HEAD is now at 203bf1f5 chore: update third-party image digests
| [command]/usr/bin/git branch --delete --force main
| Deleted branch main (was 203bf1f5).
| [command]/usr/bin/git submodule status
| [command]/usr/bin/git clean -ffdx
| Removing main-marker.txt
| [command]/usr/bin/git reset --hard HEAD

before fetching the new ref.

The flow is:

  1. Checkout main -> build operator-tool and copy script to /tmp/
  2. Checkout release-v0.76.x -> workspace is now the release branch; /tmp/ artifacts survive since they're outside the workspace

Verified locally with act, a file created after the first checkout is wiped by the second, while /tmp/ artifacts persist.

@theakshaypant

Copy link
Copy Markdown
Member Author

The CI failure looks unrelated to the changes :/

INFO: downloading ... task-s2i-ruby from https://raw.githubusercontent.com/openshift-pipelines/tektoncd-catalog/p/tasks/task-s2i-ruby/0.8.0/task-s2i-ruby.yaml
ERROR: Failed to download task-s2i-ruby

@jkhelil

jkhelil commented Jul 7, 2026

Copy link
Copy Markdown
Member

/retest

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. release-note-none Denotes a PR that doesnt merit a release note. 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.

4 participants