Regularly merge master branch into stable and stable into devel
… and into testing
if we're in a code freeze.
Problem: sometimes, website updates break the build, some test cases, or some functionality. Currently the only documented time when we merge master
into our release branches is while preparing a release.
Goal: spot problems early, instead of in the critical path of the release process.
Implementation: now that we have trusted GitLab CI runners, we should have a CI job that merges master
into stable and creates a merge request. Then, developers could merge that merge request as-is once it has passed CI. Then we should figure out how to handle the subsequent merge into devel
and, when relevant, into testing
.