X build gitlab-workhorse

software/gitlab/software.cfg

@@ -3,6 +3,7 @@
 extends =
     ../../stack/slapos.cfg
     ../../component/ruby/buildout.cfg
+    ../../component/golang/buildout.cfg
     ../../component/postgresql/buildout.cfg
     ../../component/cmake/buildout.cfg
     ../../component/icu/buildout.cfg
@@ -23,7 +24,7 @@ parts =
 
     gitlab-shell/vendor
     gitlab/vendor/bundle
-# TODO gitlab-git-http-server
+    gitlab-workhorse
 
 #   for instance
     instance.cfg
@@ -73,7 +74,7 @@ environment =
 
 
 
-# gitlab, gitlab-shell & gitlab-git-http-server checked out as git repositories
+# gitlab, gitlab-shell & gitlab-workhorse checked out as git repositories
 # pinned to exact commit
 [git-repository]
 recipe  = slapos.recipe.build:gitclone
@@ -82,7 +83,7 @@ git-executable = ${git:location}/bin/git
 [gitlab-repository]
 <= git-repository
 repository = https://gitlab.com/gitlab-org/gitlab-ce.git
-revision = v8.1.0-15-gb5391284007bb9d404de2bdc560cdd82ddae9688
+revision = v8.1.2-1-g38039e3ace0ef2a474cca264f045d9518d6a49d0
 location = ${buildout:parts-directory}/gitlab
 
 [gitlab-shell-repository]
@@ -92,12 +93,12 @@ repository = https://gitlab.com/gitlab-org/gitlab-shell.git
 revision = v2.6.5-8-g6add33352316af566cec5d827981f1783c59b7f4
 location = ${buildout:parts-directory}/gitlab-shell
 
-[gitlab-git-http-server-repository]
+[gitlab-workhorse-repository]
 <= git-repository
-repository = https://gitlab.com/gitlab-org/gitlab-git-http-server.git
+repository = https://gitlab.com/gitlab-org/gitlab-workhorse.git
 # FIXME pin properly to what gitlab-ce wants
-revision = 0.3.0-2-g01f29889311a8ace8f795f55ca92aa08602ecad4
-location = ${buildout:parts-directory}/gitlab-git-http-server
+revision = 0.4.0-1-ged976a2f21a17f269ce5fa64ba52e986eef7a924
+location = ${buildout:parts-directory}/gitlab-workhorse
 
 
 
@@ -132,8 +133,16 @@ make-targets= cd ${:path} &&
     ${:bundle} install --deployment  --without development test
 
 
+# build gitlab-workhorse
+[gitlab-workhorse]
+recipe  = slapos.recipe.cmmi
+path    = ${gitlab-workhorse-repository:location}
+
+configure-command = :
+make-targets= ${:_buildout_section_name_}
 
-# TODO build gitlab-git-http-server
+environment =
+  PATH=${golang15:location}/bin:%(PATH)s
 
 
 ###############################