From 32bd45a44ed8a381dcdb03ea2041d3ff03fd47b3 Mon Sep 17 00:00:00 2001 From: "Jeff R. Allen" Date: Wed, 29 Jan 2020 11:15:10 +0100 Subject: [PATCH 1/2] Update the Go version in all the places it is used. --- .travis.yml | 4 ++-- README.md | 12 +++++------- conode/Dockerfile | 2 +- external/docker/Dockerfile-int | 2 +- external/docker/Dockerfile-unit | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e807c6051..36afef14ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ _: &language_js _: &gen_link_kyber pushd external/js/kyber && npm ci && npm run link && popd _: &get_go - - gimme 1.12.10 - - . $HOME/.gimme/envs/go1.12.10.env + - gimme 1.12.16 + - . $HOME/.gimme/envs/go1.12.16.env _: &stage_build_go script: diff --git a/README.md b/README.md index fa5734a965..5305f3d51a 100644 --- a/README.md +++ b/README.md @@ -40,17 +40,15 @@ from a specific version and know the exact dependencies, and know when you are about to opt-in to an API-breaking change (because the major version of one or more of your dependencies changes). -We maintain a major version for 18 months. +We maintain a major version for at least 18 months. -The current major version is v3. It was released in Feb 2019. It will receive -security updates, and possibly backports of simple and essential features -from the master branch until June 2020. +The current major version is v3. It was released in Feb 2019. It is currently +built from master, and receiving security updates and new features which +maintain backwards compatibility. There is currently no plan to start work +on a new major version. The last major version was v2, which is end of life as of June 2019. -As of Oct 2019, work is starting on v4. It will be released in Feb 2020, with -an end of life in June 2021. - As a general rule, the current and last versions of Go are tested and expected to work to compile Cothority. If you encounter problems with older versions of the Go toolchain, please report them via a Github issue and we will try to solve diff --git a/conode/Dockerfile b/conode/Dockerfile index f4796f1a1e..9bacdb984a 100644 --- a/conode/Dockerfile +++ b/conode/Dockerfile @@ -1,6 +1,6 @@ ARG FROM -FROM golang:1.12 as builder +FROM golang:1.13 as builder ARG BUILD_TAG=none ARG ldflags="-s -w -X main.gitTag=unknown" RUN go get go.dedis.ch/cothority diff --git a/external/docker/Dockerfile-int b/external/docker/Dockerfile-int index d3cd35edf0..cf171dd8c9 100644 --- a/external/docker/Dockerfile-int +++ b/external/docker/Dockerfile-int @@ -6,7 +6,7 @@ # commit=`git rev-parse --short HEAD` # docker build -f Dockerfile-int -t dedis/cothority-integration-tester:$commit . -FROM golang:1.12 +FROM golang:1.13 RUN apt update && apt install pcregrep && apt clean WORKDIR /cothority diff --git a/external/docker/Dockerfile-unit b/external/docker/Dockerfile-unit index d9382601cc..5915db4466 100644 --- a/external/docker/Dockerfile-unit +++ b/external/docker/Dockerfile-unit @@ -8,7 +8,7 @@ # # As you can see, you can run the long tests using the tag build argument. -FROM golang:1.12 +FROM golang:1.13 ARG test_tag ENV TEST_TAG=$test_tag From 2099d3fe5cb3551fb48111315d38a557fd478ca4 Mon Sep 17 00:00:00 2001 From: "Jeff R. Allen" Date: Wed, 29 Jan 2020 15:51:32 +0100 Subject: [PATCH 2/2] Bump onet and kyber. --- go.mod | 6 +++--- go.sum | 22 ++++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 4167a3c33c..5da087de0c 100644 --- a/go.mod +++ b/go.mod @@ -20,9 +20,9 @@ require ( github.com/satori/go.uuid v1.2.0 github.com/stretchr/testify v1.4.0 github.com/syndtr/goleveldb v1.0.0 // indirect - github.com/urfave/cli v1.22.0 - go.dedis.ch/kyber/v3 v3.0.11 - go.dedis.ch/onet/v3 v3.0.31 + github.com/urfave/cli v1.22.2 + go.dedis.ch/kyber/v3 v3.0.12 + go.dedis.ch/onet/v3 v3.0.32 go.dedis.ch/protobuf v1.0.11 go.etcd.io/bbolt v1.3.3 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 diff --git a/go.sum b/go.sum index 4412d65cc0..bd190505c7 100644 --- a/go.sum +++ b/go.sum @@ -32,8 +32,8 @@ github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46f github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -148,10 +148,12 @@ github.com/qantik/qrgo v0.0.0-20160917134849-0c6b902c59f6/go.mod h1:if1RdEJ8j9Pb github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -164,8 +166,8 @@ github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpP github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU= github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4= github.com/tjfoc/gmsm v1.0.1/go.mod h1:XxO4hdhhrzAd+G4CjDqaOkd0hUzmtPR/d3EiBBMn/wc= -github.com/urfave/cli v1.22.0 h1:8nz/RUUotroXnOpYzT/Fy3sBp+2XEbXaY641/s3nbFI= -github.com/urfave/cli v1.22.0/go.mod h1:b3D7uWrF2GilkNgYpgcg6J+JMUw7ehmNkE8sZdliGLc= +github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo= +github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xtaci/kcp-go v5.4.5+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE= @@ -174,10 +176,10 @@ go.dedis.ch/fixbuf v1.0.3 h1:hGcV9Cd/znUxlusJ64eAlExS+5cJDIyTyEG+otu5wQs= go.dedis.ch/fixbuf v1.0.3/go.mod h1:yzJMt34Wa5xD37V5RTdmp38cz3QhMagdGoem9anUalw= go.dedis.ch/kyber/v3 v3.0.4/go.mod h1:OzvaEnPvKlyrWyp3kGXlFdp7ap1VC6RkZDTaPikqhsQ= go.dedis.ch/kyber/v3 v3.0.9/go.mod h1:rhNjUUg6ahf8HEg5HUvVBYoWY4boAafX8tYxX+PS+qg= -go.dedis.ch/kyber/v3 v3.0.11 h1:nmZQCxqcVBC8fUK1x26Z9/IhElMcCdoyRwCk1rYrarI= -go.dedis.ch/kyber/v3 v3.0.11/go.mod h1:kXy7p3STAurkADD+/aZcsznZGKVHEqbtmdIzvPfrs1U= -go.dedis.ch/onet/v3 v3.0.31 h1:iVIAxP9Zy1dEsJzRbVAgVcWtbtEOC3KVWBW0yaUYX5k= -go.dedis.ch/onet/v3 v3.0.31/go.mod h1:P9R5g5BMoye1QvPVYY3LUmiq2YKodjgKfD2/nKDYosw= +go.dedis.ch/kyber/v3 v3.0.12 h1:15d61EyBcBoFIS97kS2c/Vz4o3FR8ALnZ2ck9J/ebYM= +go.dedis.ch/kyber/v3 v3.0.12/go.mod h1:kXy7p3STAurkADD+/aZcsznZGKVHEqbtmdIzvPfrs1U= +go.dedis.ch/onet/v3 v3.0.32 h1:k3ZuLU4j+NYPtM+hakhUzffbzmoETpRV6+Z8aq3P0eU= +go.dedis.ch/onet/v3 v3.0.32/go.mod h1:dDV7bRKbT3LJ7enHBcys2O0jXEY2jTUB4dq8HtekGbA= go.dedis.ch/protobuf v1.0.5/go.mod h1:eIV4wicvi6JK0q/QnfIEGeSFNG0ZeB24kzut5+HaRLo= go.dedis.ch/protobuf v1.0.7/go.mod h1:pv5ysfkDX/EawiPqcW3ikOxsL5t+BqnV6xHSmE79KI4= go.dedis.ch/protobuf v1.0.11 h1:FTYVIEzY/bfl37lu3pR4lIj+F9Vp1jE8oh91VmxKgLo=