Skip to content

Commit

Permalink
neotest: Rework to use Go modules
Browse files Browse the repository at this point in the history
GOPATH is going to go away in Go 1.17 and most of in-tree SlapOS things are
already built using modules - including upcoming wendelin.core 2 that also
builds/uses NEO/go. This way maintaining GOPATH-based approach becomes just
unneccesary burden (modulo development, where it is still needed sometime
unfortunately golang/go#37755 (comment))
  • Loading branch information
navytux committed Mar 2, 2021
1 parent 9fdabc4 commit 44faa49
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 250 deletions.
237 changes: 0 additions & 237 deletions software/neotest/gowork.cfg

This file was deleted.

7 changes: 1 addition & 6 deletions software/neotest/software-dev.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
[buildout]
extends = software.cfg


[go_lab.nexedi.com_kirr_go123]
branch = master
revision=

[go_lab.nexedi.com_kirr_neo]
[neo]
branch = t
revision=

Expand Down
24 changes: 17 additions & 7 deletions software/neotest/software.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ extends =
../../stack/slapos.cfg
../neoppod/software-common.cfg
../../component/golang/buildout.cfg
gowork.cfg
../../component/sqlite3/buildout.cfg
../../component/zlib/buildout.cfg
../../component/wendelin.core/buildout.cfg
Expand Down Expand Up @@ -49,20 +48,31 @@ parts =
instance.cfg


# go packages to install (+ automatically their dependencies)
[neo]
<= go-git-package
go.importpath = lab.nexedi.com/kirr/neo
repository = https://lab.nexedi.com/kirr/neo.git
revision = v1.12-3107-gf278d611

[goperf]
<= go-git-package
go.importpath = golang.org/x/perf
repository = https://lab.nexedi.com/kirr/go.perf.git
revision = e8bebf9314da

# go programs to install
[gowork]
install =
lab.nexedi.com/kirr/neo/go/...
github.com/pkg/profile
golang.org/x/perf/cmd/benchstat
${neo:location}/go:./...
${goperf:location}:./cmd/benchstat

cpkgpath =
${sqlite3:location}/lib/pkgconfig
${zlib:location}/lib/pkgconfig

# dev-install neo from go checkout
[neoppod-develop]
setup = ${go_lab.nexedi.com_kirr_neo:location}
setup = ${neo:location}


# neotest-env.sh + neotest wrapper
Expand Down Expand Up @@ -99,7 +109,7 @@ template = inline:
[tnxdtest]
recipe = plone.recipe.command
stop-on-error = yes
command = ln -s -t $${directory:t} ${gowork:src}/lab.nexedi.com/kirr/neo/go/neo/t/.nxdtest
command = ln -s -t $${directory:t} ${neo:location}/go/neo/t/.nxdtest



Expand Down

0 comments on commit 44faa49

Please sign in to comment.