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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Paul Graydon
slapos
Commits
99606ba9
Commit
99606ba9
authored
Mar 25, 2021
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
galene: use newest go
Also remove old golang 1.13 version
parent
f55c892f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
28 deletions
+11
-28
component/golang/buildout.cfg
component/golang/buildout.cfg
+0
-9
software/galene/buildout.hash.cfg
software/galene/buildout.hash.cfg
+1
-1
software/galene/instance.cfg.in
software/galene/instance.cfg.in
+2
-2
software/galene/software.cfg
software/galene/software.cfg
+8
-16
No files found.
component/golang/buildout.cfg
View file @
99606ba9
...
@@ -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
...
...
software/galene/buildout.hash.cfg
View file @
99606ba9
...
@@ -15,4 +15,4 @@
...
@@ -15,4 +15,4 @@
[instance-cfg]
[instance-cfg]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
e54af429aba9b395c13471de254c4621
md5sum =
0f08627bff1ff1a6ea550507441ed120
software/galene/instance.cfg.in
View file @
99606ba9
...
@@ -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 ${g
alene:location}/bin
/galene \
exec ${g
owork: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} \
...
...
software/galene/software.cfg
View file @
99606ba9
...
@@ -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
...
...
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