chore: adopt git-flow with a develop branch - #141
Merged
Conversation
Every change has been landing straight on main, which is also the branch that publishes the site and tells TechEngine to pick up new data — so any merge was effectively a release. Adds develop as the integration branch and keeps main for released state. - validate-data now also runs on pushes to develop, so integration is checked the same way main is - bump-engine lands the submodule bump on develop instead of pushing to main. It switches branch *before* updating the submodule, so the change is staged on the branch that will carry it rather than being committed and then orphaned - README documents the model and points contributors at develop deploy-pages and notify-engine deliberately stay on main: publishing and the engine handshake should happen on release, not on every integration merge.
github-actions
Bot
added
ci
Seungpyo1007
added a commit
to GetTechAPI/TechEngine
that referenced
this pull request
Aug 3, 2026
TechAPI has adopted git-flow (GetTechAPI/TechAPI#141): main is the released state that publishes the site, develop is where integration lands. The promotion bot writes data, so it belongs on develop. Checks out TechAPI at develop as well as targeting it — cutting the bot branch from main would place it behind whatever is already integrated, and the resulting PR would drag those commits along.
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Why
Every change has been landing straight on
main— andmainis also the branch that publishes the site (deploy-pages) and tells TechEngine to pick up new data (notify-engine). So every merge was effectively a release, with no integration buffer.This adds
developas the integration branch and leavesmainfor released state. (develophas been created frommain; this PR targets it.)maindevelopfeat/*,data/*,fix/*,chore/*develop.Changes
validate-datanow runs on pushes todevelopas well, so integration gets the same checkingmaindoes.bump-enginelands the submodule bump ondevelopinstead of pushing tomain. It switches branch before updating the submodule — doing it after would commit onmain's checkout and then orphan that commit when moving todevelop.develop.deploy-pagesandnotify-enginedeliberately stay onmain. Publishing 1.1M files and handing the engine a new data pointer are release actions; firing them on every integration merge is what we're moving away from.Follow-ups (not in this PR)
verify-networkpromotion PRs frommaintodevelop— separate repo, separate PR.developso new PRs default correctly.Both workflow files parse as valid YAML.