Re-add git flow release publish with RDKCM_RDKE token and separate finish step#510
Merged
yogeswaransky merged 2 commits intoApr 12, 2026
Conversation
…nish step Agent-Logs-Url: https://github.com/rdkcentral/sysint/sessions/096e5898-eb23-42e6-9139-fd51ddfc0794 Co-authored-by: yogeswaransky <166126056+yogeswaransky@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Update component-release.yml to use RDKCM_RDKE and restructure workflow
Re-add git flow release publish with RDKCM_RDKE token and separate finish step
Apr 12, 2026
yogeswaransky
approved these changes
Apr 12, 2026
fdad136
into
feature/component-release
2 of 3 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The previous working state collapsed the release finish and push into one step and removed
git flow release publishto avoid a ruleset-blockedrelease/*branch push. This restores the original two-step structure usingRDKCM_RDKE(a PAT with ruleset bypass permissions) to allow the publish to succeed.Changes
token: ${{ secrets.RDKCM_RDKE }}so all downstream git operations inherit the PAT's permissionsgit flow release publishinstead of inlining the finish/push logicgit flow release finishthen pushesfeature/component-release,feature/main-dummy, and tagsRELEASE_VERSIONis available in the finish step via$GITHUB_ENV(written in the preceding step), consistent with how the existing cleanup step already consumes it.Original prompt
Problem
The current
component-release.ymlworkflow on thefeature/component-releasebranch works, but the user wants to re-addgit flow release publishand use theRDKCM_RDKEPAT secret (which has permissions to bypass repository rulesets that blockrelease/*branch creation). The workflow should also be restructured back to having a separate"Finish release and push"step.Current file
The file is at
.github/workflows/component-release.ymlon branchfeature/component-release(BlobSha:c1feab335a32956a8e99a34ecf5eda8368370928).Required Changes
1. Use
RDKCM_RDKEtoken for checkoutUpdate the checkout step to use the
RDKCM_RDKEsecret so that subsequent git push operations use that token's permissions:2. Rename and update the main release step
Rename
"Create release, generate changelog and push"back to"Start release, generate changelog and publish".At the end of this step's
run:block, replace:With just:
So the step ends with
git flow release publishafter the commit (like the original workflow).3. Re-add the separate "Finish release and push" step
Add back a separate step between the release step and the cleanup step:
4. Keep everything else the same
Keep the gitflow config,
git flow init -d -f, version calculation, changelog generation, and the cleanup step all as they currently are.Expected final structure of the
releasejob steps:token: ${{ secrets.RDKCM_RDKE }})git flow release publish)File to modify
.github/workflows/component-release.yml(on branchfeature/component-release)The following is the prior conversation context from the user's chat exploration (may be truncated):
User: yes
Assistant: I've kicked off the PR creation process to add
git flow init -d -fto thecomponent-release.ymlworkflow on thefeature/component-releasebranch. We're waiting for your confirmation in the dialog to proceed.User: @Copilot Accepted Confirmation: Confirm agent session
Assistant: Copilot coding agent is now working on creating the PR. You can track its progress here:
The fix is straightforward — it will add
git flow init -d -fright after the gitflow config block in.github/workflows/component-release.ymlon thefeature/component-releasebranch. Once the PR is ready, you can review and merge it, then re-run your release workflow.User: Using default branch names.
Which branch should be used for bringing forth production releases?
Branch name for production releases: [feature/component-release]
Fatal: Production and integration branches should differ.
Branch name for "next release" development: [feature/component-release]
Error: Process completed with exit code 1.
this is the error i got with :
@rdkcentral/sysint/files/.github/workflows/component-release.yml
Assistant:
The Problem
git flow init -duses the default branch names (masteranddevelop), but then your earlier config set bothgitflow.branch.masterandgitflow.branch.developtofeature/component-release. Whengit flow init -d -fruns, it detects this and fails because:Git-flow fundamentally requires the production branch and the development branch to be different branches. You cannot use the same branch for both.
The Core Issue
Your workflow design tries to use
feature/component-releaseas both the production and development branch, which is incompatible with git-flow's architecture. Git-flow needs at minimum two distinct bra...This pull request was created from Copilot chat.