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

Automatically merge 3.x-dev branch into master whenever the 3.x-dev branch automated tests build is green #10677

Closed
mattab opened this issue Oct 4, 2016 · 1 comment
Labels
c: Platform For Matomo platform changes that aren't impacting any of our APIs but improve the core itself. c: Tests & QA For issues related to automated tests or making it easier to QA & test issues. wontfix If you can reproduce this issue, please reopen the issue or create a new one describing it.

Comments

@mattab
Copy link
Member

mattab commented Oct 4, 2016

The goal of this issue is to implement automatic merging of 3.x-dev branch into master branch, whenever the development branch (3.x-dev) automated tests build is green.

Implementation

Hopefully it is quite easy to implement using:

  • Travis CI webhooks
  • Define an end point with a script that has git repo push access
  • Run the few git commands to merge the develop branch into master and push

As a result we will

  • always have a green master branch
  • we can release Piwik 3.X releases regularly and painlessly.
@mattab mattab added the c: Tests & QA For issues related to automated tests or making it easier to QA & test issues. label Oct 4, 2016
@mattab mattab added this to the 3.0.0-rc milestone Oct 4, 2016
@mattab mattab added Major Indicates the severity or impact or benefit of an issue is much higher than normal but not critical. c: Platform For Matomo platform changes that aren't impacting any of our APIs but improve the core itself. labels Dec 5, 2016
@mattab mattab modified the milestones: 3.0.0, 3.0.0-rc Dec 5, 2016
@mattab mattab removed the Major Indicates the severity or impact or benefit of an issue is much higher than normal but not critical. label Dec 15, 2017
@sgiehl
Copy link
Member

sgiehl commented May 17, 2023

Closing this one, as we are not using the master branch for anything anymore.

@sgiehl sgiehl closed this as not planned Won't fix, can't repro, duplicate, stale May 17, 2023
@sgiehl sgiehl added the wontfix If you can reproduce this issue, please reopen the issue or create a new one describing it. label May 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c: Platform For Matomo platform changes that aren't impacting any of our APIs but improve the core itself. c: Tests & QA For issues related to automated tests or making it easier to QA & test issues. wontfix If you can reproduce this issue, please reopen the issue or create a new one describing it.
Projects
None yet
Development

No branches or pull requests

2 participants