...
...
...
...
...
...
...
...
...
Info |
---|
Warning |
This page is outdated and will be archived. The updated version of this document lives here: Merge Timing Guidelines for openedx Repositories |
Table of Contents | ||||
---|---|---|---|---|
|
Context
Groups of individuals with merge rights to one or more public repositories in the edx
GitHub organization include:
...
When is edx/configuration deployed? | edx/configuration is continuously deployed to production. Upon merging a pull request, it is generally released to the Staging environment (http://courses.stage.edx.org ) within one hour and the Production environments (http://courses.edx.org and edge.edx.org) within two hours. |
---|---|
What is the ideal merge window? | The best time to merge edx/configuration code is whenever you or your champion is prepared to respond issues related to the change, once it hits production ~2 hours later. For edX employees/contractors: this is generally M-F, within your team’s preferred working hours. (see below for more details) For CCP Committers: this is roughly the working hours of your champion(s). The edx/configuration Champions working hours are local to the UTC +05:00 timezone |
What should I do once I merge? | Committers should inform their champions about the merge. edX employees/contractors may post in the edX-Internal Slack |
...
What is the ideal merge window? | CCP Committers: You likely have already worked something out with your champions. Generally speaking, you can merge to these repositories whenever you want to (taking into consideration the table above), presuming that the PR meets all review requirements. |
---|---|
What should I do once I merge? | CCP Committers should inform their champions. edX employees/contractors should inform the owning team. Depending on the repository, you may need to deploy. |
Are there other times merging is discouraged? | At the moment, no. |
...