EE Compatibility Check Job Fails Unexpectedly
Currently, the ee_compat_check
job for gitlab-org/gitlab-ce!15387 is failing for unknown reasons.
Link to build: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/41522315
It is displaying the following message:
💥 Oh no! 💥
The `27742-display-member-role-per-project` does not apply cleanly to the current EE/master, and
even though a `ee-27742-display-member-role-per-project` branch
exists in the EE repository, it does not apply cleanly either to
EE/master!
The conflicts detected were as follows:
The EE branch does merge cleanly into master. I have checked this several times. It seems that the compatibility check is not generating the correct merge-base for the EE branch with EE master.
In the log it claims the merge-base is 419cffdb13
when in fact it should be 3a2dbc7e39
:
$ git merge-base master ee-27742-display-member-role-per-project
3a2dbc7e3965ea3aaf7ab46849371f83dff2e796
For reference, in case the branches in question are deleted or modified, the current HEAD of ee-27742-display-member-role-per-project
is a4dc555306
and the current HEAD of 27742-display-member-role-per-project
is a22379574c
.
/cc @rymai