Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upMigrating to a GitHub organization #27
Comments
ebkalderon
added
diff: medium
type: task
pri: normal
labels
Mar 13, 2016
ebkalderon
added this to the 1.0 milestone
Mar 13, 2016
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
LucioFranco
Mar 14, 2016
Member
For #3 I think we should go with something similar to what gfx/gf-rs does and have a stable or master branch, it contains the current code that has been tested. We can then have branches for every 0.X release and for every 0.X.Y release we can just put those commits on top of the 0.X branch. Everything else seems good!
Edit: I forgot but we could track our minor and hotfixes via git tags.
|
For Edit: I forgot but we could track our minor and hotfixes via git tags. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
ebkalderon
Mar 16, 2016
Member
@LucioFranco I would personally prefer having a single release branch with each release version being tagged, similar to Git Flow's approach, mostly because I can see the sheer number of branches becoming overwhelming a few major versions down the line. What do you think about this?
|
@LucioFranco I would personally prefer having a single |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
White-Oak
Mar 17, 2016
Contributor
@ebkalderon I'm up for this. But if, in the future, someone will request a bugfix for an older version (say, 1.5, when current is 1.7) it makes sense to branch out from tagged release and submit a bugfix.
|
@ebkalderon I'm up for this. But if, in the future, someone will request a bugfix for an older version (say, 1.5, when current is 1.7) it makes sense to branch out from tagged release and submit a bugfix. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
@White-Oak That is absolutely correct, yes. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
LucioFranco
Mar 19, 2016
Member
@ebkalderon Sorry for the delayed response was on vacation. I agree with your point. One thing that I want to bring up is the future support of 0.X or when time comes A.X releases. One issue with theses is that they are more likely to need long-term support. It may be nice to only create branches for very major releases. This will allow for a cleaner way of managing old releases and to easily submit bugfixes. I find that git tag is very complicated to hotfix code without added branches. So it may be worthwhile having a few branches for major releases. We can always delete old branches. Besides that, I think everything looks good!
|
@ebkalderon Sorry for the delayed response was on vacation. I agree with your point. One thing that I want to bring up is the future support of 0.X or when time comes A.X releases. One issue with theses is that they are more likely to need long-term support. It may be nice to only create branches for very major releases. This will allow for a cleaner way of managing old releases and to easily submit bugfixes. I find that git tag is very complicated to hotfix code without added branches. So it may be worthwhile having a few branches for major releases. We can always delete old branches. Besides that, I think everything looks good! |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
White-Oak
Mar 19, 2016
Contributor
@LucioFranco you can always branch out from every commit, so I don't see, why keep branches, instead of creating them when they are needed.
|
@LucioFranco you can always branch out from every commit, so I don't see, why keep branches, instead of creating them when they are needed. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
LucioFranco
Mar 19, 2016
Member
@White-Oak will that not add a bunch of hotfix branches that need to be added to the repo? You need to create a new branch to hotfix no matter what unless you wanna do git magic. So to me, it makes more sense to have a major branch and just add the hotfix commits on top of that. But what I am also saying is that we do not keep smaller versions for branches. If someone has an issue with 1.5 we just tell them to upgrade to the latest because it has no breaking changes instead of hotfixing 1.5. But if there is an issue with 1.3 and we are on 2.1 there would be a release-v1 branch that we can then easily hotfix. We can still use git tags for every version to keep track but going into detached head mode with git tags is not an easy thing to deal with.
|
@White-Oak will that not add a bunch of hotfix branches that need to be added to the repo? You need to create a new branch to hotfix no matter what unless you wanna do git magic. So to me, it makes more sense to have a major branch and just add the hotfix commits on top of that. But what I am also saying is that we do not keep smaller versions for branches. If someone has an issue with 1.5 we just tell them to upgrade to the latest because it has no breaking changes instead of hotfixing 1.5. But if there is an issue with 1.3 and we are on 2.1 there would be a release-v1 branch that we can then easily hotfix. We can still use git tags for every version to keep track but going into detached head mode with git tags is not an easy thing to deal with. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
@LucioFranco compatibility between minor versions is a myth |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
LucioFranco
Mar 19, 2016
Member
@White-Oak so what you suggest then is to just keep everything tagged with git tag and then when a hotfix is needed create a branch for it?
|
@White-Oak so what you suggest then is to just keep everything tagged with git tag and then when a hotfix is needed create a branch for it? |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
White-Oak
Mar 19, 2016
Contributor
@LucioFranco yes, why not? If a version is compatible with current one, then a separate branch is not needed, but sometimes there'll be a need.
|
@LucioFranco yes, why not? If a version is compatible with current one, then a separate branch is not needed, but sometimes there'll be a need. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
LucioFranco
Mar 19, 2016
Member
@White-Oak That makes sense. That means we only need extra branches for that one off occasions where someone needs an old hotfix.
|
@White-Oak That makes sense. That means we only need extra branches for that one off occasions where someone needs an old hotfix. |
ebkalderon
added
the
status: in-progress
label
Mar 22, 2016
LucioFranco
referenced this issue
in amethyst/website
Mar 22, 2016
Merged
Add RSS support for cobalt blog #4
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
LucioFranco
Mar 23, 2016
Member
@ebkalderon
For the rest of the items. I think we should just split our Gitter chat into:
general
engine
documentation
render possibly
And I don't think there is a way of preserving the hyperlinks and I think it is better that we move soon rather than later to run into less of these types of issues.
|
@ebkalderon general And I don't think there is a way of preserving the hyperlinks and I think it is better that we move soon rather than later to run into less of these types of issues. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
@LucioFranco there should be a room for website |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
LucioFranco
Mar 23, 2016
Member
@White-Oak I was thinking of combing website into documentation. There could probably be a better name.
|
@White-Oak I was thinking of combing website into documentation. There could probably be a better name. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
@LucioFranco Maybe information? |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
White-Oak
Mar 23, 2016
Contributor
@LucioFranco I do not really think website should be merged with documentation.
|
@LucioFranco I do not really think website should be merged with documentation. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
LucioFranco
Mar 23, 2016
Member
@White-Oak why is that? I think that there is not going to be much website talk so there should just be one chat for all things related to stuff on the website including the documentation.
Edit: I think we should have a general channel, and then one for each repo.
|
@White-Oak why is that? I think that there is not going to be much website talk so there should just be one chat for all things related to stuff on the website including the documentation. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
ebkalderon
Mar 23, 2016
Member
@LucioFranco Personally, I prefer to keep webdev and documentation separate since I consider them separate things. Our conversations about CloudFlare, domain names, and TWIA are completely separate from, for example, adding book chapters or improving misleading docs.
While the book and API docs happen to be hosted on amethyst.rs, they are stored in the amethyst repository for a reason. They are meant to be accessible locally, not just online, and should be treated separately from the website. Does this make sense?
However, I do agree with you that the overall structure should be a general channel and then one room for each repo. I just want documentation to be a separate room since it crosses repository boundaries.
|
@LucioFranco Personally, I prefer to keep webdev and documentation separate since I consider them separate things. Our conversations about CloudFlare, domain names, and TWIA are completely separate from, for example, adding book chapters or improving misleading docs. While the book and API docs happen to be hosted on However, I do agree with you that the overall structure should be a |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
LucioFranco
Mar 23, 2016
Member
@ebkalderon that makes sense! I think we should go ahead with what you suggest!
|
@ebkalderon that makes sense! I think we should go ahead with what you suggest! |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
|
@ebkalderon sounds reasonable. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
ebkalderon
Mar 23, 2016
Member
Okay. I've updated the top post with the candidate Gitter chat layout. Looks good?
|
Okay. I've updated the top post with the candidate Gitter chat layout. Looks good? |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
ebkalderon
Mar 23, 2016
Member
I think we have reached a consensus on all of the proposed issues! We are ready for the transition.
|
I think we have reached a consensus on all of the proposed issues! We are ready for the transition. |
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
ebkalderon
Mar 24, 2016
Member
We are almost done! This is all that is left:
- Codify the branching model in either
CONTRIBUTING.mdor on the wiki. - Wait for Gitter issue 1185 about improving our chat rooms to be resolved
|
We are almost done! This is all that is left:
|
This was referenced Mar 31, 2016
This comment has been minimized.
Show comment
Hide comment
This comment has been minimized.
ebkalderon
Mar 31, 2016
Member
With the tasks above complete, this issue is now considered resolved.
|
With the tasks above complete, this issue is now considered resolved. |
ebkalderon commentedMar 13, 2016
This is a big step, but I think I'm ready to migrate the Amethyst repositories away from my personal account to a GitHub organization. Before I do this, I need to confirm the following matters:
Current Status
Here's the current status of these questions, as gathered from our collective discussion both on this issue and on Gitter:
masteron this repo to "future-proof" these links before taking down https://ebkalderon.github.io/amethyst.generalchannel + 1 channel for each repository. I personally want documentation to be a separate room since it crosses repository boundaries. How does this room layout look to you guys?