Skip to content

Fix git-flow init failure: use feature/main-dummy as production branch #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yogeswaransky merged 2 commits into from
Apr 12, 2026
+6 −2
Merged

Fix git-flow init failure: use feature/main-dummy as production branch #508

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8171510
Initial plan
Copilot Apr 12, 2026
dcd239d
Fix git-flow init: use feature/main-dummy as production branch
Copilot Apr 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/component-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down
Loading