From 9d81a74429e093f3167875e0145ad957874c77d1 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 10 Jul 2018 10:12:55 -0400 Subject: [PATCH 1/3] dev version --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 6ba0dcb42..f9faedf04 100644 --- a/version/version.go +++ b/version/version.go @@ -10,7 +10,7 @@ const ( var ( // Version is the current version of Tendermint // Must be a string because scripts like dist.sh read this file. - Version = "0.22.2" + Version = "0.22.2-dev" // GitCommit is the current HEAD set using ldflags. GitCommit string From ebe97d3956e8873cc7a2033ed9cc83c14ed8d073 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 10 Jul 2018 11:28:41 -0400 Subject: [PATCH 2/3] dep: pin all deps to version or commit --- Gopkg.lock | 27 +++++++++------------- Gopkg.toml | 67 ++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 56 insertions(+), 38 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index b1beaa208..44192a011 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -11,10 +11,9 @@ branch = "master" name = "github.com/btcsuite/btcd" packages = ["btcec"] - revision = "86fed781132ac890ee03e906e4ecd5d6fa180c64" + revision = "fdfc19097e7ac6b57035062056f5b7b4638b8898" [[projects]] - branch = "master" name = "github.com/btcsuite/btcutil" packages = [ "base58", @@ -29,16 +28,15 @@ version = "v1.1.0" [[projects]] - branch = "master" name = "github.com/ebuchman/fail-test" packages = ["."] revision = "95f809107225be108efcf10a3509e4ea6ceef3c4" [[projects]] - branch = "master" name = "github.com/fortytw2/leaktest" packages = ["."] - revision = "b008db64ef8daabb22ff6daa557f33b41d8f6ccd" + revision = "a5ef70473c97b71626b9abeda80ee92ba2a7de9e" + version = "v1.2.0" [[projects]] name = "github.com/fsnotify/fsnotify" @@ -180,13 +178,12 @@ version = "v1.0.0" [[projects]] - branch = "master" name = "github.com/prometheus/client_golang" packages = [ "prometheus", "prometheus/promhttp" ] - revision = "d6a9817c4afc94d51115e4a30d449056a3fbf547" + revision = "ae27198cdd90bf12cd134ad79d1366a6cf49f632" [[projects]] branch = "master" @@ -213,10 +210,9 @@ "nfs", "xfs" ] - revision = "40f013a808ec4fa79def444a1a56de4d1727efcb" + revision = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a" [[projects]] - branch = "master" name = "github.com/rcrowley/go-metrics" packages = ["."] revision = "e2704e165165ec55d062f5919b4b29494e9fa790" @@ -266,8 +262,8 @@ "assert", "require" ] - revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" - version = "v1.2.2" + revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71" + version = "v1.2.1" [[projects]] branch = "master" @@ -286,7 +282,7 @@ "leveldb/table", "leveldb/util" ] - revision = "e2150783cd35f5b607daca48afd8c57ec54cc995" + revision = "c4c61651e9e37fa117f53c5a906d3b63090d8445" [[projects]] branch = "master" @@ -326,7 +322,6 @@ revision = "a49355c7e3f8fe157a85be2f77e6e269a0f89602" [[projects]] - branch = "master" name = "golang.org/x/net" packages = [ "context", @@ -338,7 +333,7 @@ "netutil", "trace" ] - revision = "4cb1c02c05b0e749b0365f61ae859a8e0cfceed9" + revision = "292b43bbf7cb8d35ddf40f8d5100ef3837cced3f" [[projects]] branch = "master" @@ -347,7 +342,7 @@ "cpu", "unix" ] - revision = "7138fd3d9dc8335c567ca206f4333fb75eb05d56" + revision = "1b2967e3c290b7c545b3db0deeda16e9be4f98a2" [[projects]] name = "golang.org/x/text" @@ -414,6 +409,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "6e854634d6c203278ce83bef7725cecbcf90023b0d0e440fb3374acedacbd5ad" + inputs-digest = "b0718135d5ade0a75c6b8fe703f70eb9d8064ba871ec31abd9ace3c4ab944100" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index ecce0e417..7bf82798e 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -23,16 +23,12 @@ # non-go = false # go-tests = true # unused-packages = true +# +########################################################### +# NOTE: All packages should be pinned to specific versions. +# Packages without releases must pin to a commit. -[[constraint]] - name = "github.com/ebuchman/fail-test" - branch = "master" - -[[constraint]] - name = "github.com/fortytw2/leaktest" - branch = "master" - [[constraint]] name = "github.com/go-kit/kit" version = "=0.6.0" @@ -47,16 +43,12 @@ [[constraint]] name = "github.com/gorilla/websocket" - version = "~1.2.0" + version = "=1.2.0" [[constraint]] name = "github.com/pkg/errors" version = "=0.8.0" -[[constraint]] - name = "github.com/rcrowley/go-metrics" - branch = "master" - [[constraint]] name = "github.com/spf13/cobra" version = "=0.0.1" @@ -67,29 +59,60 @@ [[constraint]] name = "github.com/stretchr/testify" - version = "~1.2.1" + version = "=1.2.1" [[constraint]] name = "github.com/tendermint/go-amino" - version = "~0.10.1" + version = "=0.10.1" [[constraint]] name = "google.golang.org/grpc" - version = "~1.11.3" + version = "=1.11.3" -# this got updated and broke, so locked to an old working commit ... +[[constraint]] + name = "github.com/fortytw2/leaktest" + version = "=1.2.0" + +################################### +## Some repos dont have releases. +## Pin to revision + +## We can remove this one by updating protobuf to v1.1.0 +## but then the grpc tests break with +#--- FAIL: TestBroadcastTx (0.01s) +#panic: message/group field common.KVPair:bytes without pointer [recovered] +# panic: message/group field common.KVPair:bytes without pointer +# +# ... +# +# github.com/tendermint/tendermint/rpc/grpc_test.TestBroadcastTx(0xc420a5ab40) +# /go/src/github.com/tendermint/tendermint/rpc/grpc/grpc_test.go:29 +0x141 [[override]] name = "google.golang.org/genproto" revision = "7fd901a49ba6a7f87732eb344f6e3c5b19d1b200" -[prune] - go-tests = true - unused-packages = true +[[constraint]] + name = "github.com/ebuchman/fail-test" + revision = "95f809107225be108efcf10a3509e4ea6ceef3c4" + +# last revision used by go-crypto +[[constraint]] + name = "github.com/btcsuite/btcutil" + revision = "d4cc87b860166d00d6b5b9e0d3b3d71d6088d4d4" +# Haven't made a release since 2016. [[constraint]] name = "github.com/prometheus/client_golang" - branch = "master" + revision = "ae27198cdd90bf12cd134ad79d1366a6cf49f632" + +[[constraint]] + name = "github.com/rcrowley/go-metrics" + revision = "e2704e165165ec55d062f5919b4b29494e9fa790" [[constraint]] - branch = "master" name = "golang.org/x/net" + revision = "292b43bbf7cb8d35ddf40f8d5100ef3837cced3f" + +[prune] + go-tests = true + unused-packages = true From 17c924de7eba97c711cee9abaab052d14c7015d6 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 10 Jul 2018 11:30:33 -0400 Subject: [PATCH 3/3] changelog, version --- CHANGELOG.md | 7 +++++++ version/version.go | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f15507c0..9b56915f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 0.22.3 + +IMPROVEMENTS +- Update dependencies + * pin all values in Gopkg.toml to version or commit + * update golang/protobuf to v1.1.0 + ## 0.22.2 *July 10th, 2018* diff --git a/version/version.go b/version/version.go index f9faedf04..4e677b5f4 100644 --- a/version/version.go +++ b/version/version.go @@ -4,13 +4,13 @@ package version const ( Maj = "0" Min = "22" - Fix = "2" + Fix = "3" ) var ( // Version is the current version of Tendermint // Must be a string because scripts like dist.sh read this file. - Version = "0.22.2-dev" + Version = "0.22.3" // GitCommit is the current HEAD set using ldflags. GitCommit string