Commit 4aedd717 authored by Kirill Smelkov's avatar Kirill Smelkov

Merge branch 'master' into master+ZODB4-wc2

* master:
  wendelin.core: Target wendelin.core 2 to use Go1.17
  golang: +go1.17 -go1.15
  golang: v↑ go1.16 (1.16.4 -> 1.16.8)
parents cca3a5c5 99cf4bfd
...@@ -42,25 +42,24 @@ md5sum = 6b607fc795391dc609ffd79ebf41f080 ...@@ -42,25 +42,24 @@ md5sum = 6b607fc795391dc609ffd79ebf41f080
environment-extra = environment-extra =
GOROOT_BOOTSTRAP=${golang14:location} GOROOT_BOOTSTRAP=${golang14:location}
[golang1.15] [golang1.16]
<= golang-common <= golang-common
url = https://golang.org/dl/go1.15.12.src.tar.gz url = https://golang.org/dl/go1.16.8.src.tar.gz
md5sum = b3a5dafa7028fa00083ce4aeaf5bcb9a md5sum = 92e69a5e1bb6ea5e7498d12d03160032
# go1.15 needs go1.4 to bootstrap # go1.16 needs go1.4 to bootstrap
environment-extra = environment-extra =
GOROOT_BOOTSTRAP=${golang14:location} GOROOT_BOOTSTRAP=${golang14:location}
[golang1.16] [golang1.17]
<= golang-common <= golang-common
url = https://golang.org/dl/go1.16.4.src.tar.gz url = https://golang.org/dl/go1.17.1.src.tar.gz
md5sum = 5884a4cb49067b9bcf6e69a1ef44259c md5sum = a78205838c2a7054522cb91c12982f26
# go1.16 needs go1.4 to bootstrap # go1.17 needs go1.4 to bootstrap
environment-extra = environment-extra =
GOROOT_BOOTSTRAP=${golang14:location} GOROOT_BOOTSTRAP=${golang14:location}
# ---- infrastructure to build Go workspaces / projects ---- # ---- infrastructure to build Go workspaces / projects ----
# gowork is the top-level section that defines Go workspace. # gowork is the top-level section that defines Go workspace.
......
...@@ -12,3 +12,7 @@ ...@@ -12,3 +12,7 @@
repository = https://lab.nexedi.com/kirr/wendelin.core.git repository = https://lab.nexedi.com/kirr/wendelin.core.git
branch = t branch = t
revision = revision =
# Wendelin.core 2 targets Go1.17
[gowork]
golang = ${golang1.17:location}
...@@ -32,6 +32,9 @@ parts = ...@@ -32,6 +32,9 @@ parts =
[python] [python]
part = python3 part = python3
[gowork]
golang = ${golang1.17:location}
# Macro for jinja templates. The filename is set in buildout.hash.cfg # Macro for jinja templates. The filename is set in buildout.hash.cfg
# in the section using this template # in the section using this template
[jinja-template] [jinja-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