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
7f3c97f8
Commit
7f3c97f8
authored
Feb 27, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the ee-files-location-check job for forks
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
6da3156e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
5 deletions
+2
-5
scripts/ee-files-location-check
scripts/ee-files-location-check
+2
-5
No files found.
scripts/ee-files-location-check
View file @
7f3c97f8
...
@@ -18,14 +18,11 @@ WHITELIST = [
...
@@ -18,14 +18,11 @@ WHITELIST = [
new_files_in_this_branch_not_at_the_ee_top_level
=
new_files_in_this_branch_not_at_the_ee_top_level
=
`git diff canonical-ee/master...HEAD --name-status --diff-filter=A -- ./ ':!ee' | cut -f2`
.
lines
.
map
(
&
:strip
)
`git diff canonical-ee/master...HEAD --name-status --diff-filter=A -- ./ ':!ee' | cut -f2`
.
lines
.
map
(
&
:strip
)
ce_repo_url
=
ENV
[
'CI_REPOSITORY_URL'
].
sub
(
'gitlab-ee'
,
'gitlab-ce'
)
current_branch
=
ENV
.
fetch
(
'CI_COMMIT_REF_NAME'
,
`git rev-parse --abbrev-ref HEAD`
).
strip
current_branch
=
ENV
.
fetch
(
'CI_COMMIT_REF_NAME'
,
`git rev-parse --abbrev-ref HEAD`
).
strip
ce_branch_name
=
current_branch
.
sub
(
/(\Aee\-|\-ee\z)/
,
''
)
ce_branch_name
=
current_branch
.
sub
(
/(\Aee\-|\-ee\z)/
,
''
)
`git fetch canonical-ce
#{
ce_branch_name
}
--quiet`
`git fetch
#{
ce_repo_url
}
#{
ce_branch_name
}
--quiet`
||
`git fetch canonical-ce 'master' --quiet`
unless
$?
.
success?
`git fetch canonical-ce 'master' --quiet`
end
ee_specific_files_in_ce_master_not_at_the_ee_top_level
=
ee_specific_files_in_ce_master_not_at_the_ee_top_level
=
`git diff FETCH_HEAD..HEAD --name-status --diff-filter=A -- ./ ':!ee' | cut -f2`
.
lines
.
map
(
&
:strip
)
`git diff FETCH_HEAD..HEAD --name-status --diff-filter=A -- ./ ':!ee' | cut -f2`
.
lines
.
map
(
&
:strip
)
...
...
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