Skip to content
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.

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

[INFO] How Branching works for Packages #230

Open
arm4b opened this issue Mar 9, 2016 · 4 comments
Open

[INFO] How Branching works for Packages #230

arm4b opened this issue Mar 9, 2016 · 4 comments

Comments

@arm4b
Copy link
Member

arm4b commented Mar 9, 2016

st2-packages repo now follows st2 branching strategy. What it means.

The Logic:

  • Inside st2-packages repo:
    • pushing to master of st2-packages repo will generate packages based on master of st2
    • pushing to v1.3 of st2-packages repo will generate packages based on v1.3 of st2
    • opening PR against master branch of st2-packages repo will use st2 master code
    • opening PR against v1.3 branch of st2-packages repo will use st2 v1.3 code
    • opening PR against any other branch of st2-packages repo will use ST2_GITREV hardcoded version in circle.yml
  • Inside st2 repo:
    • pushing to master of st2 repo will generate packages based on master of st2-packages
    • pushing to v1.3 of st2 repo will generate packages based on v1.3 of st2-packages
    • note that we don't enable CircleCI Pull Requests in st2 repo yet

Rebuild the Package Manually:

Normally pushing to v1.3 branch for any st2 or st2-packages repos will generate and deploy v1.3 staging packages.
Usually that's enough, but if you want to do that manually without pushing changes, just use CircleCI rebuild:

@arm4b
Copy link
Member Author

arm4b commented Mar 9, 2016

^^ @enykeev @dennybaa @lakshmi-kannan please review the logic and provide your ideas if you have.

That'll be better automated after merging:
#227
#229
StackStorm/st2#2569
StackStorm/st2#2570

@enykeev
Copy link
Member

enykeev commented Mar 9, 2016

opening PR against any other branch of st2-packages repo will use st2 master code (fallback)

Not really. As of 86a4a43, it depends on the point you're branching from. Any commit that branches after 86a4a43 will use 1.3 branch of st2.

@arm4b
Copy link
Member Author

arm4b commented Mar 9, 2016

@enykeev see: #227 PR.

@arm4b
Copy link
Member Author

arm4b commented Mar 9, 2016

As discussed with @enykeev, closing #227 branch autodetection as error-prone way.
ST2_GITREV hardcoding in each branch of st2-packages will work.

I guess we'll end up with hardcoding in st2 repo as well later, once we enable PR statuses there, if Circle won't add builds on Opened PRs

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

No branches or pull requests

2 participants