From c4764ff9161f61d8ae16c17e63855275e6598d2e Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Wed, 10 Aug 2016 01:45:55 -0400 Subject: [PATCH] update glide.lock --- glide.lock | 42 ++++++++++++++++++++++------------------- scripts/glide/parse.sh | 5 +++-- scripts/glide/status.sh | 2 +- scripts/glide/update.sh | 5 +++-- 4 files changed, 30 insertions(+), 24 deletions(-) diff --git a/glide.lock b/glide.lock index ce301894..3d31f944 100644 --- a/glide.lock +++ b/glide.lock @@ -1,36 +1,36 @@ hash: d87a1fe0061d41c1e6ec78d405d54ae321e75f4bff22b38d19d3255bbd17f21e -updated: 2016-06-11T18:38:47.019992204-07:00 +updated: 2016-08-10T01:41:31.374647528-04:00 imports: - name: github.com/btcsuite/btcd - version: ff4ada0b0e1ebffa3f9c15cadc96ab0d08a11034 + version: bd4e64d1d43bad445dd8e6577907c0c265cd83c2 subpackages: - btcec - name: github.com/btcsuite/fastsha256 version: 302ad4db268b46f9ebda3078f6f7397f96047735 - name: github.com/BurntSushi/toml - version: f0aeabca5a127c4078abb8c8d64298b147264b55 + version: 99064174e013895bbd9b025c31100bd1d9b590ca - name: github.com/go-stack/stack version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82 - name: github.com/gogo/protobuf - version: 318371cbef6bab80e8d1c69b470fffa79eebfb54 + version: a4cceea7a401a73fefafd1a21fedbd4694124a82 subpackages: - proto - name: github.com/golang/protobuf - version: 8616e8ee5e20a1704615e6c8d7afcdac06087a67 + version: 2c1988e8c18d14b142c0b472624f71647cf39adb subpackages: - proto - name: github.com/golang/snappy version: d9eb7a3d35ec988b8585d4a0068e462c27d28380 - name: github.com/gorilla/websocket - version: a68708917c6a4f06314ab4e52493cc61359c9d42 + version: a69d25be2fe2923a97c2af6849b2f52426f68fc0 - name: github.com/mattn/go-colorable - version: 9056b7a9f2d1f2d96498d6d146acd1f9d5ed3d59 + version: ed8eb9e318d7a84ce5915b495b7d35e0cfe7b5a8 - name: github.com/mattn/go-isatty - version: 56b76bdf51f7708750eac80fa38b952bb9f32639 + version: 66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8 - name: github.com/spf13/pflag - version: 367864438f1b1a3c7db4da06a2f55b144e6784e0 + version: f676131e2660dc8cd88de99f7486d34aa8172635 - name: github.com/syndtr/goleveldb - version: fa5b5c78794bc5c18f330361059f871ae8c2b9d6 + version: ab8b5dcf1042e818ab68e770d465112a899b668e subpackages: - leveldb - leveldb/errors @@ -54,11 +54,13 @@ imports: - name: github.com/tendermint/go-clist version: 3baa390bbaf7634251c42ad69a8682e7e3990552 - name: github.com/tendermint/go-common - version: dee6622bf7f811d3ba8638a3f5ffaf8d679aa9d9 + version: 3dabf304a16e42ce2db6a456ef508a75cdf17679 + subpackages: + - test - name: github.com/tendermint/go-config version: e64b424499acd0eb9856b88e10c0dff41628c0d6 - name: github.com/tendermint/go-crypto - version: 41cfb7b677f4e16cdfd22b6ce0946c89919fbc7b + version: 4b11d62bdb324027ea01554e5767b71174680ba0 - name: github.com/tendermint/go-db version: 31fdd21c7eaeed53e0ea7ca597fb1e960e2988a5 - name: github.com/tendermint/go-events @@ -72,7 +74,7 @@ imports: subpackages: - upnp - name: github.com/tendermint/go-rpc - version: dea910cd3e71bbfaf1973fd7ba295f0ee515a25f + version: 479510be0e80dd9e5d6b1f941adad168df0af85f subpackages: - client - server @@ -84,14 +86,16 @@ imports: subpackages: - term - name: github.com/tendermint/tmsp - version: ba11348508939e9d273cdc1cc476c5c611e14e66 + version: 58bacfb04e36cf4babae25da3b9068ae91dc662b subpackages: - client - example/dummy - example/nil - types + - example/counter + - server - name: golang.org/x/crypto - version: 77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e + version: e0d166c33c321d0ff863f459a5882096e334f508 subpackages: - ripemd160 - nacl/box @@ -102,7 +106,7 @@ imports: - poly1305 - openpgp/errors - name: golang.org/x/net - version: 3f122ce3dbbe488b7e6a8bdb26f41edec852a40b + version: 075e191f18186a8ff2becaf64478e30f4545cdad subpackages: - context - http2 @@ -111,11 +115,11 @@ imports: - lex/httplex - internal/timeseries - name: golang.org/x/sys - version: 7f918dd405547ecb864d14a8ecbbfe205b5f930f + version: a646d33e2ee3172a661fc09bca23bb4889a41bc8 subpackages: - unix - name: google.golang.org/grpc - version: daeb9cc0f2607997cce611a1458e71b981ce5986 + version: 6140c2e83cbed8b448f28a16c1bda2947f1d7ba3 subpackages: - codes - credentials @@ -125,4 +129,4 @@ imports: - naming - transport - peer -devImports: [] +testImports: [] diff --git a/scripts/glide/parse.sh b/scripts/glide/parse.sh index a2f68d54..a92f70bc 100644 --- a/scripts/glide/parse.sh +++ b/scripts/glide/parse.sh @@ -1,7 +1,8 @@ #! /bin/bash set -euo pipefail -GLIDE=$1 -LIB=$2 +LIB=$1 + +GLIDE=$GOPATH/src/github.com/tendermint/tendermint/glide.lock cat $GLIDE | grep -A1 $LIB | grep -v $LIB | awk '{print $2}' diff --git a/scripts/glide/status.sh b/scripts/glide/status.sh index 11e573ae..046bd57e 100644 --- a/scripts/glide/status.sh +++ b/scripts/glide/status.sh @@ -2,7 +2,7 @@ # for every github.com/tendermint dependency, warn is if its not synced with origin/master -GLIDE=$1 +GLIDE=$GOPATH/src/github.com/tendermint/tendermint/glide.lock # make list of libs LIBS=($(grep "github.com/tendermint" $GLIDE | awk '{print $3}')) diff --git a/scripts/glide/update.sh b/scripts/glide/update.sh index 630859d8..040bc267 100644 --- a/scripts/glide/update.sh +++ b/scripts/glide/update.sh @@ -4,8 +4,9 @@ IFS=$'\n\t' # script to update the given dependency in the glide.lock file with the checked out branch on the local host -GLIDE=$1 -LIB=$2 +LIB=$1 + +GLIDE=$GOPATH/src/github.com/tendermint/tendermint/glide.lock OLD_COMMIT=`bash scripts/glide/parse.sh $GLIDE $LIB`