Commit 99606ba9 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

galene: use newest go

Also remove old golang 1.13 version
parent f55c892f
Pipeline #14429 failed with stage
in 0 seconds
...@@ -42,15 +42,6 @@ md5sum = 6b607fc795391dc609ffd79ebf41f080 ...@@ -42,15 +42,6 @@ md5sum = 6b607fc795391dc609ffd79ebf41f080
environment-extra = environment-extra =
GOROOT_BOOTSTRAP=${golang14:location} GOROOT_BOOTSTRAP=${golang14:location}
[golang1.13]
<= golang-common
url = https://golang.org/dl/go1.13.15.src.tar.gz
md5sum = 4f4af14d88352a62761a9dcedf863ac0
# go1.13 needs go1.4 to bootstrap
environment-extra =
GOROOT_BOOTSTRAP=${golang14:location}
[golang1.15] [golang1.15]
<= golang-common <= golang-common
url = https://golang.org/dl/go1.15.10.src.tar.gz url = https://golang.org/dl/go1.15.10.src.tar.gz
......
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
[instance-cfg] [instance-cfg]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = e54af429aba9b395c13471de254c4621 md5sum = 0f08627bff1ff1a6ea550507441ed120
...@@ -74,8 +74,8 @@ template = ...@@ -74,8 +74,8 @@ template =
inline:#!/bin/sh inline:#!/bin/sh
ulimit -n $(ulimit -Hn) ulimit -n $(ulimit -Hn)
exec ${galene:location}/bin/galene \ exec ${gowork:bin}/galene \
-static ${galene-repository:location}/static \ -static ${galene:location}/static \
-recordings $${directory:recordings} \ -recordings $${directory:recordings} \
-groups $${directory:groups} \ -groups $${directory:groups} \
-data $${directory:data} \ -data $${directory:data} \
......
...@@ -7,7 +7,6 @@ extends = ...@@ -7,7 +7,6 @@ extends =
parts = parts =
slapos-cookbook slapos-cookbook
galene
eggs eggs
instance-cfg instance-cfg
...@@ -19,25 +18,18 @@ eggs = ...@@ -19,25 +18,18 @@ eggs =
collective.recipe.template collective.recipe.template
[galene-repository] [galene]
<= git-repository <= go-git-package
go.importpath = lab.nexedi.com/nexedi/galene
repository = https://lab.nexedi.com/nexedi/galene.git repository = https://lab.nexedi.com/nexedi/galene.git
revision = galene-0.3 revision = galene-0.3
location = ${buildout:parts-directory}/galene-repository
[galene] [gowork]
recipe = slapos.recipe.cmmi install =
path = ${galene-repository:location} ${galene:location}:./...
location = @@LOCATION@@
golang = ${golang1.13:location}
configure-command = true
make-binary =
make-targets =
go install -ldflags='-s -w'
environment = environment =
PATH=${:location}/bin:${:golang}/bin:${git:location}/bin:${pkgconfig:location}/bin:$PATH CGO_ENABLED = 0
GOPATH=${:location} buildflags = -ldflags='-s -w'
CGO_ENABLED=0
[instance-cfg] [instance-cfg]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment