From 7312f9b18b69713eeea0ae13c597843fab25f0ec Mon Sep 17 00:00:00 2001 From: Alain Takoudjou <alain.takoudjou@nexedi.com> Date: Tue, 10 Oct 2017 12:32:55 +0200 Subject: [PATCH] gitlab, helloweb: use golang version 1.9 --- component/helloweb/buildout.cfg | 2 +- software/gitlab/software.cfg | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/component/helloweb/buildout.cfg b/component/helloweb/buildout.cfg index a2d243dd7..42abbcf37 100644 --- a/component/helloweb/buildout.cfg +++ b/component/helloweb/buildout.cfg @@ -89,7 +89,7 @@ input = inline: recipe = slapos.recipe.cmmi path = ${helloweb-repository:location}/go/ -go = ${golang18:location}/bin/go +go = ${golang19:location}/bin/go configure-command = : make-binary = make-targets= cd ${:path} && diff --git a/software/gitlab/software.cfg b/software/gitlab/software.cfg index 43d8a62e5..95db5c81d 100644 --- a/software/gitlab/software.cfg +++ b/software/gitlab/software.cfg @@ -27,7 +27,7 @@ extends = parts = ruby2.1 - golang16 + golang19 git postgresql92 redis28 @@ -211,7 +211,7 @@ make-targets= cd ${git2go-repository:location} && cp -a ${git-backup-repository:location}/contrib/gitlab-backup ${gopath:bin} environment = PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig - PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${git:location}/bin:${golang16:location}/bin:${buildout:bin-directory}:%(PATH)s + PATH=${cmake:location}/bin:${pkgconfig:location}/bin:${git:location}/bin:${golang19:location}/bin:${buildout:bin-directory}:%(PATH)s GOPATH=${gopath:directory} [xnice-repository] @@ -245,7 +245,7 @@ configure-command = : make-targets= ${:_buildout_section_name_} environment = - PATH=${golang16:location}/bin:%(PATH)s + PATH=${golang19:location}/bin:%(PATH)s ############################### -- 2.30.9