Do foundational work to support to support gitlab-org/gitlab default branch on merge-train
Overview
#1357 (closed) plans to rename gitlab-org/gitlab
default branch from master
to main
, the timeline is still in the works (it might happen during the first quarter of 2021) but when it happens we should be prepared.
Let's use this issue to discuss what needs to be done on the https://gitlab.com/gitlab-org/merge-train project before the switch.
Proposal
From a quick grep search it seems we do reference gitlab-org/gitlab
master
branch in some parts of the codebase.
./bin/merge-train:18:SOURCE_BRANCH="${SOURCE_BRANCH:-master}"
./bin/merge-train:21:TARGET_BRANCH="${TARGET_BRANCH:-master}"
./bin/merge-train:66: # just pull from `master`.
./README.md:42:Then you can run the merge train as follows to merge all CE `master` changes
./README.md:43:into EE `master`:
./README.md:72:merge:master:
./README.md:87: key: 'merge:master'
./README.md:99:The private and public key are located in 1Password in the "Release" vault, with the name `merge-train: GitLab EE security/master deploy key`
./CONTRIBUTING.md:10:[DCO + License](https://gitlab.com/gitlab-org/dco/blob/master/README.md)
./.gitlab-ci.yml:4: # for every push to `master`.
./.gitlab-ci.yml:41: - $CI_COMMIT_REF_NAME == 'master'
The rough plan could be as follow:
- Fetch somehow the
gitlab-org/gitlab
default branch - Use that branch instead of a hardcoded
master
string.