ee_compat_check fails on dev
Recently more of us noticed merge requests on dev always failed due to the ee_compat_check
for some reason. Example failing build: https://dev.gitlab.org/gitlab/gitlabhq/-/jobs/3840713
@godfat says:
unfortunately this job doesn't work well because it's not using the same pattern on
dev
(CE vs EE project names) as on GitLab.com, therefore you can ignore it
I'm not sure I fully understand because below I see the script checking out master
CE from dev and master
EE from GitLab.com:
$ git clone --branch master --single-branch --depth=200 https://dev.gitlab.org/gitlab/gitlabhq.git /builds/gitlab/gitlabhq/ee_compat_check/ee-repo
==> Finished in 0.130532413 seconds
=> Cloning https://gitlab.com/gitlab-org/gitlab-ee.git into /builds/gitlab/gitlabhq/ee_compat_check/ee-repo
$ git clone --branch master --single-branch --depth=200 https://gitlab.com/gitlab-org/gitlab-ee.git /builds/gitlab/gitlabhq/ee_compat_check/ee-repo
==> Finished in 73.780547193 seconds
=> In the /builds/gitlab/gitlabhq/ee_compat_check/ee-repo directory
=> Adding the ee remote (https://dev.gitlab.org/gitlab/gitlabhq.git)
$ git remote add ee https://dev.gitlab.org/gitlab/gitlabhq.git
==> Finished in 0.012293975 seconds
=> Adding the canonical-ee remote (https://gitlab.com/gitlab-org/gitlab-ee.git)
$ git remote add canonical-ee https://gitlab.com/gitlab-org/gitlab-ee.git
==> Finished in 0.010885735 seconds
=> Fetching deeper...
$ git fetch --depth=20 --prune canonical-ee +refs/heads/master:refs/remotes/canonical-ee/master
==> Finished in 0.687636503 seconds
=> Checking out master
$ git checkout master
==> Finished in 0.42852831 seconds
=> Resetting to latest master
$ git reset --hard canonical-ee/master
==> Finished in 0.146561111 seconds
=> Checking if /builds/gitlab/gitlabhq/ee_compat_check/patches/sh-fix-issue-56663-11-5.patch applies cleanly to EE/master
$ git apply --3way /builds/gitlab/gitlabhq/ee_compat_check/patches/sh-fix-issue-56663-11-5.patch
==> Finished in 0.950981083 seconds
/builds/gitlab/gitlabhq/ee_compat_check/patches/sh-fix-issue-56663-11-5.patch:1154: trailing whitespace.
width: swipeMaxPixelWidth
/builds/gitlab/gitlabhq/ee_compat_check/patches/sh-fix-issue-56663-11-5.patch:9260: trailing whitespace.
a timeout will be issued with a log of the number of operations performed
/builds/gitlab/gitlabhq/ee_compat_check/patches/sh-fix-issue-56663-11-5.patch:9724: trailing whitespace.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/26723) in GitLab 11.5.
/builds/gitlab/gitlabhq/ee_compat_check/patches/sh-fix-issue-56663-11-5.patch:9726: trailing whitespace.
For issues with many comments like activity notes and user comments, sometimes
/builds/gitlab/gitlabhq/ee_compat_check/patches/sh-fix-issue-56663-11-5.patch:9727: trailing whitespace.
finding useful information can be hard. There is a way to filter comments from single notes and discussions for merge requests and issues.
error: patch failed: .gitlab-ci.yml:318
Falling back to three-way merge...
Applied patch to '.gitlab-ci.yml' cleanly.
error: .gitlab/CODEOWNERS: does not exist in index
error: patch failed: CHANGELOG.md:2
Falling back to three-way merge...
Applied patch to 'CHANGELOG.md' with conflicts.
error: patch failed: GITLAB_PAGES_VERSION:1
Falling back to three-way merge...