ee-files-location-check picks the wrong CE branch
In context of a CE-to-EE patch MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4937, I've picked changes from CE in branch 31114-internal-ids-are-not-atomic
, cleaned up any conflicts and changed other EE-specific files accordingly (e.g. use NonatomicInternalId
instead of the old one).
Now the build fails because of the ee-files-location-check.
=> Running `git ls-remote https://gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@gitlab.com/gitlab-org/gitlab-ce.git "*31114-internal-ids-are-not-atomic*"`
💪 We found the branch '31114-internal-ids-are-not-atomic-2' in the https://gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@gitlab.com/gitlab-org/gitlab-ce.git repository. We will fetch it.
=> Running `git fetch https://gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@gitlab.com/gitlab-org/gitlab-ce.git 31114-internal-ids-are-not-atomic-2 --quiet`
=> Running `git diff FETCH_HEAD..HEAD --name-status --diff-filter=A -- ./ ':!ee' | cut -f2`
* 💥 changelogs/unreleased/31114-internal-ids-are-not-atomic.yml is EE-specific and should be moved to ee/changelogs/unreleased/31114-internal-ids-are-not-atomic.yml: 💥
=> git mv changelogs/unreleased/31114-internal-ids-are-not-atomic.yml ee/changelogs/unreleased/31114-internal-ids-are-not-atomic.yml
* 💥 spec/support/shared_examples/models/atomic_internal_id_spec.rb is EE-specific and should be moved to ee/spec/support/shared_examples/models/atomic_internal_id_spec.rb: 💥
=> git mv spec/support/shared_examples/models/atomic_internal_id_spec.rb ee/spec/support/shared_examples/models/atomic_internal_id_spec.rb
Note that, git ls-remote .. "*31114-internal-ids-are-not-atomic*"
yields two branches:
e82a5e004ac8aa1de64c4627e0fbed6a027a3fdf refs/heads/31114-internal-ids-are-not-atomic
0c2085331829f65078207fe95f9784b9c1469281 refs/heads/31114-internal-ids-are-not-atomic-2
I kept the -2
branch for reference, it includes an alternative solution but is otherwise unrelated to the MR at hand (and the other branch).
I suspect the build failure is because the wrong branch 31114-internal-ids-are-not-atomic-2
gets picked, which does not include the files mentioned above. If it were picking the right branch 31114-internal-ids-are-not-atomic-2
I'd expect it to pass.
I'm wondering if we should make scripts/ee-files-location-check
more strict in which branch to pick.