From 81715104e8142f0859ef0ea2658fe5fa30a2253f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 08:29:53 +0000 Subject: [PATCH 1/2] Initial plan From dcd239d7a88847413dff20421a4cee24a9ce32ac Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 08:31:13 +0000 Subject: [PATCH 2/2] Fix git-flow init: use feature/main-dummy as production branch Agent-Logs-Url: https://github.com/rdkcentral/sysint/sessions/4029adcb-d3f4-4edf-9267-25d04f36d2a8 Co-authored-by: yogeswaransky <166126056+yogeswaransky@users.noreply.github.com> --- .github/workflows/component-release.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/component-release.yml b/.github/workflows/component-release.yml index 2e294875..e5017fc1 100644 --- a/.github/workflows/component-release.yml +++ b/.github/workflows/component-release.yml @@ -52,8 +52,8 @@ jobs: run: | set -e - # Configure git-flow to use feature/component-release as both master and develop - git config gitflow.branch.master feature/component-release + # Configure git-flow to use feature/main-dummy as master and feature/component-release as develop + git config gitflow.branch.master feature/main-dummy git config gitflow.branch.develop feature/component-release git config gitflow.prefix.feature feature/ git config gitflow.prefix.bugfix bugfix/ @@ -62,6 +62,9 @@ jobs: git config gitflow.prefix.support support/ git config gitflow.prefix.versiontag '' + # Ensure the production branch exists locally + git fetch origin feature/main-dummy:feature/main-dummy 2>/dev/null || git branch feature/main-dummy feature/component-release + # Initialize git-flow (required for git flow commands to work) git flow init -d -f @@ -114,6 +117,7 @@ jobs: set -e git flow release finish -m "$RELEASE_VERSION release" "$RELEASE_VERSION" git push origin feature/component-release + git push origin feature/main-dummy git push origin --tags - name: Cleanup tag if workflow fails