Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
44be1fcb
Commit
44be1fcb
authored
Sep 12, 2019
by
Alessio Caiazza
Committed by
Rémy Coutable
Sep 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove EE specific checks
parent
4360d9ad
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
112 deletions
+0
-112
.gitlab-ci.yml
.gitlab-ci.yml
+0
-1
.gitlab/ci/ee-specific-checks.gitlab-ci.yml
.gitlab/ci/ee-specific-checks.gitlab-ci.yml
+0
-22
scripts/ee-files-location-check
scripts/ee-files-location-check
+0
-47
scripts/ee-specific-lines-check
scripts/ee-specific-lines-check
+0
-42
No files found.
.gitlab-ci.yml
View file @
44be1fcb
...
...
@@ -42,4 +42,3 @@ include:
-
local
:
.gitlab/ci/setup.gitlab-ci.yml
-
local
:
.gitlab/ci/test-metadata.gitlab-ci.yml
-
local
:
.gitlab/ci/yaml.gitlab-ci.yml
-
local
:
.gitlab/ci/ee-specific-checks.gitlab-ci.yml
.gitlab/ci/ee-specific-checks.gitlab-ci.yml
deleted
100644 → 0
View file @
4360d9ad
.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
scripts/ee-files-location-check
deleted
100755 → 0
View file @
4360d9ad
#!/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
)
scripts/ee-specific-lines-check
deleted
100755 → 0
View file @
4360d9ad
#!/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
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment