Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
0
Merge Requests
0
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
Jean-Paul Smets
slapos
Commits
10613374
Commit
10613374
authored
Apr 18, 2017
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gilab-sr fixup: remove usage of z3c.recipe.scripts which doesn't work with buildout2
parent
3f4b983a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
6 deletions
+16
-6
software/gitlab/software.cfg
software/gitlab/software.cfg
+16
-6
No files found.
software/gitlab/software.cfg
View file @
10613374
...
@@ -39,6 +39,7 @@ parts =
...
@@ -39,6 +39,7 @@ parts =
python-4gitlab
python-4gitlab
gitlab-shell/vendor
gitlab-shell/vendor
gitlab/vendor/bundle
gitlab/vendor/bundle
github-markup-patch
gitlab-workhorse
gitlab-workhorse
git-backup
git-backup
...
@@ -74,11 +75,7 @@ md5sum = 3cd1dca37be60668f482545716923b72
...
@@ -74,11 +75,7 @@ md5sum = 3cd1dca37be60668f482545716923b72
# python with eggs, that will be used in gitlab
# python with eggs, that will be used in gitlab
[python-4gitlab]
[python-4gitlab]
# NOTE cannot use zc.recipe.egg - github-markup invoks `python2 -S` and
recipe = zc.recipe.egg
# interpreter generated by zc.recipe.egg cannot handle that.
recipe = z3c.recipe.scripts
# NOTE github-markup invokes it as `python2`, that's why we are naming it this way
# https://github.com/github/markup/blob/5393ae93/lib/github/markups.rb#L36
interpreter = python2
interpreter = python2
eggs =
eggs =
docutils
docutils
...
@@ -152,7 +149,20 @@ repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
...
@@ -152,7 +149,20 @@ repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
revision = v0.7.1-5-gd23a3247829fc3200e3dc784dcd57b5a0febac48
revision = v0.7.1-5-gd23a3247829fc3200e3dc784dcd57b5a0febac48
location = ${buildout:parts-directory}/gitlab-workhorse
location = ${buildout:parts-directory}/gitlab-workhorse
# Patch github markup to not call "python2 -S /path/to/rest2html" but only "python2 /path/to/rest2html"
# NOTE github-markup invokes it as `python2`, that's why we are naming it this way
# https://github.com/github/markup/blob/5393ae93/lib/github/markups.rb#L36
[github-markup-patch]
recipe = plone.recipe.command
command =
files=$(ls ${gitlab-repository:location}/vendor/bundle/ruby/*/gems/github-markup-*/lib/github/markups.rb) || true
if [ ! -z $files ]; then
for file in $files; do
sed -i 's#python2 -S#python2#' $file
done
fi
update-command = ${:command}
stop-on-error = True
# build needed-by-gitlab gems via bundler
# build needed-by-gitlab gems via bundler
[gitlab/vendor/bundle]
[gitlab/vendor/bundle]
...
...
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