Gitaly version file conflicts prevent automatic RC creation
In gitlab-org/gitlab!31887 (merged) we saw another case of the Gitaly server version file conflicting, preventing the merge request from being merged. @nolith mentioned this will likely keep happening, so we need a solution for this.
I can think of the following options:
- We check the diff, and if GITALY_SERVER_VERSION is changed we update it accordingly on the target branch using the API, before creating the merge request.
-
👍 This will reduce the amount of manual work needed -
👍 Not too hard to implement -
👎 Does not scale very well if we need to take other files into account -
👎 Only works for files that we are aware of
-
- We just assign the MR to a release manager when there is a conflict.
-
👍 Probably not too difficult to implement -
👎 Does not scale as conflicts like the Gitaly version are likely to happen often -
👎 Requires one to manually retry the RC job, otherwise you have to wait until the next time it runs
-
- We use a local Git repository to merge the changes
-
👍 We can deal with all conflicts by just overwriting the target changes -
👍 No manual intervention is necessary -
👎 We need to clone a Git repository, set up credentials, etc -
👎 Feels like a step back as we're trying to move away from using Git directly in Release Tools (at least where possible)
-