Commit 7ba91a0f authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'nolith-master-patch-81959' into 'master'

Remove EE specific checks

See merge request gitlab-org/gitlab-ee!16513
parents 4360d9ad 44be1fcb
...@@ -42,4 +42,3 @@ include: ...@@ -42,4 +42,3 @@ include:
- local: .gitlab/ci/setup.gitlab-ci.yml - local: .gitlab/ci/setup.gitlab-ci.yml
- local: .gitlab/ci/test-metadata.gitlab-ci.yml - local: .gitlab/ci/test-metadata.gitlab-ci.yml
- local: .gitlab/ci/yaml.gitlab-ci.yml - local: .gitlab/ci/yaml.gitlab-ci.yml
- local: .gitlab/ci/ee-specific-checks.gitlab-ci.yml
.ee-specific-check:
extends: .default-tags
dependencies: []
only:
- branches@gitlab-org/gitlab-ee
except:
- master
- tags
- /[\d-]+-stable(-ee)?/
- /[\d-]+-auto-deploy-\d{7}/
- /^security-/
- /\bce\-to\-ee\b/
ee-files-location-check:
extends: .ee-specific-check
script:
- scripts/ee-files-location-check
ee-specific-lines-check:
extends: .ee-specific-check
script:
- scripts/ee-specific-lines-check
#!/usr/bin/env ruby
require_relative 'ee_specific_check/ee_specific_check'
include EESpecificCheck # rubocop:disable Style/MixinUsage
git_version
ce_fetch_head = fetch_remote_ce_branch
ee_fetch_base = run_git_command("merge-base canonical-ee/master HEAD")
ce_merge_base = run_git_command("merge-base canonical-ce/master canonical-ee/master")
ce_updated_base =
if ce_fetch_head.start_with?('canonical-ce')
ce_merge_base
else
ce_fetch_head
end
new_files_in_this_branch_not_at_the_ee_top_level =
run_git_command("diff #{ee_fetch_base}...HEAD --name-status --diff-filter=A -- ./ ':!ee' ':!qa/qa/ee' ':!qa/qa/specs/features/ee' | cut -f2").lines.map(&:strip)
ee_specific_files_in_ce_master_not_at_the_ee_top_level =
run_git_command("diff #{ce_updated_base}..HEAD --name-status --diff-filter=A -- ./ ':!ee' ':!qa/qa/ee' ':!qa/qa/specs/features/ee' | cut -f2").lines.map(&:strip)
new_ee_specific_files_not_at_the_ee_top_level =
new_files_in_this_branch_not_at_the_ee_top_level & ee_specific_files_in_ce_master_not_at_the_ee_top_level
status = 0
new_ee_specific_files_not_at_the_ee_top_level.each do |file|
next if WHITELIST.any? { |pattern| Dir.glob(pattern, File::FNM_DOTMATCH).include?(file) }
puts
puts "* 💥 #{file} is EE-specific and should be moved to ee/#{file}: 💥"
puts " => git mv #{file} ee/#{file}"
status = 1
end
if status.zero?
say "🎉 All good, congrats! 🎉"
end
remove_remotes
say "ℹ️ For more information on the why and how of this job, see https://docs.gitlab.com/ee/development/ee_features.html#detection-of-ee-only-files"
exit(status)
#!/usr/bin/env ruby
require_relative 'ee_specific_check/ee_specific_check'
include EESpecificCheck # rubocop:disable Style/MixinUsage
git_version
base = find_compare_base
current_numstat = updated_diff_numstat(base.ce_base, base.ee_base)
updated_numstat = updated_diff_numstat(base.ce_head, base.ee_head)
offenses = updated_numstat.select do |file, updated_delta|
current_delta = current_numstat[file]
more_lines = updated_delta > current_delta
more_lines &&
!WHITELIST.any? { |pattern| Dir.glob(pattern, File::FNM_DOTMATCH).include?(file) }
end
if offenses.empty?
say "🎉 All good, congrats! 🎉"
else
puts
offenses.each do |(file, delta)|
puts "* 💥 #{file} has #{delta - current_numstat[file]} updated lines that differ between EE and CE! 💥"
end
say <<~MESSAGE
ℹ️ Make sure all lines in shared files have been updated in your backport merge request and the branch name includes #{minimal_ce_branch_name}.
ℹ️ Consider using an EE module to add the features you want.
ℹ️ See this for detail: https://docs.gitlab.com/ee/development/ee_features.html#ee-features-based-on-ce-features
MESSAGE
end
remove_remotes
say "ℹ️ For more information on why, see https://gitlab.com/gitlab-org/gitlab-ee/issues/2952"
exit(offenses.size)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment