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
Change to our git flow: introducing the new stable, build green, master
branch.
#5954
Comments
FYI, develop can be rebased automatically using .travis.yml (after travis_system branch is merged). |
Can Travis CI automatically merge |
I think so yes, have to do the following for each job in a build:
For this to work, no commits should be done manually on master w/o sync-ing w/ develop. When merging pull requests, we will have to sync manually w/ develop. |
Moving back this issue to |
this issue may help: #6757 |
In the last few months we have made many improvements to our CI setup. One major issue remains, it is to fix all randomly failing tests. Luckily we have fixed almost all cases, but here are the last remaining ones:
Once we do these fixes, |
once we fix random builds, |
Challenge to solve
Community developers contributing to Piwik (eg. via pull requests) often will checkout a code that has broken tests. Pull requests execute on tests that were already broken so devs get a bad feeling when they start contributing 👎
Solution
We have discussed this for two hours during our team meetup in Munich and have come to some useful action points:
master
branch should always have a green build!develop
branchdevelop
tomaster
whendevelop
is green, regularlyQuestions
develop
tomaster
(daily or every few days?)Result: anyone issuing Pull requests will have a chance to see green build for their proposed changes,
this is part of broader improvements to the way Piwik functions internally and as a community. see also #5953 new Changelog.md file for developers
The text was updated successfully, but these errors were encountered: