Merge branch 'release/0.5.2'
This commit is contained in:
commit
8e8da7c9d7
|
@ -1,5 +1,10 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 0.5.2 (June 2, 2017)
|
||||||
|
|
||||||
|
BUG FIXES:
|
||||||
|
- fix parsing of the log level from Tendermint config (#97)
|
||||||
|
|
||||||
## 0.5.1 (May 30, 2017)
|
## 0.5.1 (May 30, 2017)
|
||||||
|
|
||||||
BUG FIXES:
|
BUG FIXES:
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -8,6 +8,10 @@ build:
|
||||||
install:
|
install:
|
||||||
go install ./cmd/...
|
go install ./cmd/...
|
||||||
|
|
||||||
|
dist:
|
||||||
|
@ sudo bash scripts/dist.sh
|
||||||
|
@ bash scripts/publish.sh
|
||||||
|
|
||||||
test:
|
test:
|
||||||
go test `${NOVENDOR}`
|
go test `${NOVENDOR}`
|
||||||
#go run tests/tendermint/*.go
|
#go run tests/tendermint/*.go
|
||||||
|
|
|
@ -12,8 +12,8 @@ import (
|
||||||
"github.com/tendermint/abci/server"
|
"github.com/tendermint/abci/server"
|
||||||
eyes "github.com/tendermint/merkleeyes/client"
|
eyes "github.com/tendermint/merkleeyes/client"
|
||||||
"github.com/tendermint/tmlibs/cli"
|
"github.com/tendermint/tmlibs/cli"
|
||||||
|
cliflags "github.com/tendermint/tmlibs/cli/flags"
|
||||||
cmn "github.com/tendermint/tmlibs/common"
|
cmn "github.com/tendermint/tmlibs/common"
|
||||||
"github.com/tendermint/tmlibs/log"
|
|
||||||
|
|
||||||
"github.com/tendermint/tendermint/config"
|
"github.com/tendermint/tendermint/config"
|
||||||
"github.com/tendermint/tendermint/node"
|
"github.com/tendermint/tendermint/node"
|
||||||
|
@ -139,13 +139,10 @@ func startTendermint(dir string, basecoinApp *app.Basecoin) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: parse the log level from the config properly (multi modules)
|
tmLogger, err := cliflags.ParseLogLevel(cfg.LogLevel, logger, config.DefaultConfig().LogLevel)
|
||||||
// but some tm code must be refactored for better usability
|
|
||||||
lvl, err := log.AllowLevel(cfg.LogLevel)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
tmLogger := log.NewFilter(logger, lvl)
|
|
||||||
|
|
||||||
// Create & start tendermint node
|
// Create & start tendermint node
|
||||||
privValidator := types.LoadOrGenPrivValidator(cfg.PrivValidatorFile(), tmLogger)
|
privValidator := types.LoadOrGenPrivValidator(cfg.PrivValidatorFile(), tmLogger)
|
||||||
|
|
|
@ -1,14 +1,12 @@
|
||||||
hash: 6fe7f47866652e5e30218a29dcb26a35ff1d4e0be16d9589a07143bd55309577
|
hash: b31c6e45072e1015b04b5a201fb5ffcbadb837f21fe4a499f3b7e93229ee1c45
|
||||||
updated: 2017-05-29T15:49:33.34896889+02:00
|
updated: 2017-06-02T09:22:48.505187474Z
|
||||||
imports:
|
imports:
|
||||||
- name: github.com/bgentry/speakeasy
|
- name: github.com/bgentry/speakeasy
|
||||||
version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
|
version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
|
||||||
- name: github.com/btcsuite/btcd
|
- name: github.com/btcsuite/btcd
|
||||||
version: b8df516b4b267acf2de46be593a9d948d1d2c420
|
version: 1ae306021e323ae11c71ffb8546fbd9019e6cb6f
|
||||||
subpackages:
|
subpackages:
|
||||||
- btcec
|
- btcec
|
||||||
- name: github.com/btcsuite/fastsha256
|
|
||||||
version: 637e656429416087660c84436a2a035d69d54e2e
|
|
||||||
- name: github.com/BurntSushi/toml
|
- name: github.com/BurntSushi/toml
|
||||||
version: b26d9c308763d68093482582cea63d69be07a0f0
|
version: b26d9c308763d68093482582cea63d69be07a0f0
|
||||||
- name: github.com/ebuchman/fail-test
|
- name: github.com/ebuchman/fail-test
|
||||||
|
@ -30,9 +28,9 @@ imports:
|
||||||
- name: github.com/go-playground/universal-translator
|
- name: github.com/go-playground/universal-translator
|
||||||
version: 71201497bace774495daed26a3874fd339e0b538
|
version: 71201497bace774495daed26a3874fd339e0b538
|
||||||
- name: github.com/go-stack/stack
|
- name: github.com/go-stack/stack
|
||||||
version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82
|
version: 7a2f19628aabfe68f0766b59e74d6315f8347d22
|
||||||
- name: github.com/golang/protobuf
|
- name: github.com/golang/protobuf
|
||||||
version: 18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8
|
version: b50ceb1fa9818fa4d78b016c2d4ae025593a7ce3
|
||||||
subpackages:
|
subpackages:
|
||||||
- proto
|
- proto
|
||||||
- ptypes/any
|
- ptypes/any
|
||||||
|
@ -41,9 +39,9 @@ imports:
|
||||||
- name: github.com/gorilla/context
|
- name: github.com/gorilla/context
|
||||||
version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42
|
version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42
|
||||||
- name: github.com/gorilla/handlers
|
- name: github.com/gorilla/handlers
|
||||||
version: 3a5767ca75ece5f7f1440b1d16975247f8d8b221
|
version: 13d73096a474cac93275c679c7b8a2dc17ddba82
|
||||||
- name: github.com/gorilla/mux
|
- name: github.com/gorilla/mux
|
||||||
version: bcd8bc72b08df0f70df986b97f95590779502d31
|
version: 392c28fe23e1c45ddba891b0320b3b5df220beea
|
||||||
- name: github.com/gorilla/websocket
|
- name: github.com/gorilla/websocket
|
||||||
version: a91eba7f97777409bc2c443f5534d41dd20c5720
|
version: a91eba7f97777409bc2c443f5534d41dd20c5720
|
||||||
- name: github.com/hashicorp/hcl
|
- name: github.com/hashicorp/hcl
|
||||||
|
@ -103,7 +101,7 @@ imports:
|
||||||
- leveldb/table
|
- leveldb/table
|
||||||
- leveldb/util
|
- leveldb/util
|
||||||
- name: github.com/tendermint/abci
|
- name: github.com/tendermint/abci
|
||||||
version: 864d1f80b36b440bde030a5c18d8ac3aa8c2949d
|
version: b86da575718079396af1f7fe3609ea34be6f855d
|
||||||
subpackages:
|
subpackages:
|
||||||
- client
|
- client
|
||||||
- example/dummy
|
- example/dummy
|
||||||
|
@ -141,7 +139,7 @@ imports:
|
||||||
- commands/txs
|
- commands/txs
|
||||||
- proofs
|
- proofs
|
||||||
- name: github.com/tendermint/merkleeyes
|
- name: github.com/tendermint/merkleeyes
|
||||||
version: a0e73e1ac3e18e12a007520a4ea2c9822256e307
|
version: 6b06ad654956c951b3d27e38bb566ae45aae1ff7
|
||||||
subpackages:
|
subpackages:
|
||||||
- app
|
- app
|
||||||
- client
|
- client
|
||||||
|
@ -174,10 +172,11 @@ imports:
|
||||||
- types
|
- types
|
||||||
- version
|
- version
|
||||||
- name: github.com/tendermint/tmlibs
|
- name: github.com/tendermint/tmlibs
|
||||||
version: 306795ae1d8e4f4a10dcc8bdb32a00455843c9d5
|
version: 6b619742ac69388dd591c30f55aaee46197b086e
|
||||||
subpackages:
|
subpackages:
|
||||||
- autofile
|
- autofile
|
||||||
- cli
|
- cli
|
||||||
|
- cli/flags
|
||||||
- clist
|
- clist
|
||||||
- common
|
- common
|
||||||
- db
|
- db
|
||||||
|
@ -187,7 +186,7 @@ imports:
|
||||||
- logger
|
- logger
|
||||||
- merkle
|
- merkle
|
||||||
- name: golang.org/x/crypto
|
- name: golang.org/x/crypto
|
||||||
version: c7af5bf2638a1164f2eb5467c39c6cffbd13a02e
|
version: ab89591268e0c8b748cbe4047b00197516011af5
|
||||||
subpackages:
|
subpackages:
|
||||||
- curve25519
|
- curve25519
|
||||||
- nacl/box
|
- nacl/box
|
||||||
|
@ -198,7 +197,7 @@ imports:
|
||||||
- ripemd160
|
- ripemd160
|
||||||
- salsa20/salsa
|
- salsa20/salsa
|
||||||
- name: golang.org/x/net
|
- name: golang.org/x/net
|
||||||
version: feeb485667d1fdabe727840fe00adc22431bc86e
|
version: c9b681d35165f1995d6f3034e61f8761d4b90c99
|
||||||
subpackages:
|
subpackages:
|
||||||
- context
|
- context
|
||||||
- http2
|
- http2
|
||||||
|
@ -223,7 +222,7 @@ imports:
|
||||||
subpackages:
|
subpackages:
|
||||||
- googleapis/rpc/status
|
- googleapis/rpc/status
|
||||||
- name: google.golang.org/grpc
|
- name: google.golang.org/grpc
|
||||||
version: 844f573616520565fdc6fb4db242321b5456fd6d
|
version: a0c3e72252b6fbf4826bb143e450eb05588a9d6d
|
||||||
subpackages:
|
subpackages:
|
||||||
- codes
|
- codes
|
||||||
- credentials
|
- credentials
|
||||||
|
@ -244,7 +243,7 @@ imports:
|
||||||
version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
|
version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
|
||||||
testImports:
|
testImports:
|
||||||
- name: github.com/davecgh/go-spew
|
- name: github.com/davecgh/go-spew
|
||||||
version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9
|
version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9
|
||||||
subpackages:
|
subpackages:
|
||||||
- spew
|
- spew
|
||||||
- name: github.com/pmezard/go-difflib
|
- name: github.com/pmezard/go-difflib
|
||||||
|
@ -252,7 +251,7 @@ testImports:
|
||||||
subpackages:
|
subpackages:
|
||||||
- difflib
|
- difflib
|
||||||
- name: github.com/stretchr/testify
|
- name: github.com/stretchr/testify
|
||||||
version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0
|
version: 4d4bfba8f1d1027c4fdbe371823030df51419987
|
||||||
subpackages:
|
subpackages:
|
||||||
- assert
|
- assert
|
||||||
- require
|
- require
|
||||||
|
|
|
@ -49,6 +49,7 @@ import:
|
||||||
version: ~0.2.0
|
version: ~0.2.0
|
||||||
subpackages:
|
subpackages:
|
||||||
- cli
|
- cli
|
||||||
|
- cli/flags
|
||||||
- common
|
- common
|
||||||
- events
|
- events
|
||||||
- log
|
- log
|
||||||
|
|
|
@ -21,13 +21,6 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
|
||||||
# Change into that dir because we expect that.
|
# Change into that dir because we expect that.
|
||||||
cd "$DIR"
|
cd "$DIR"
|
||||||
|
|
||||||
# Generate the tag.
|
|
||||||
if [ -z "$NOTAG" ]; then
|
|
||||||
echo "==> Tagging..."
|
|
||||||
git commit --allow-empty -a -m "Release v$VERSION"
|
|
||||||
git tag -a -m "Version $VERSION" "v${VERSION}" master
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Do a hermetic build inside a Docker container.
|
# Do a hermetic build inside a Docker container.
|
||||||
docker build -t tendermint/${REPO_NAME}-builder scripts/${REPO_NAME}-builder/
|
docker build -t tendermint/${REPO_NAME}-builder scripts/${REPO_NAME}-builder/
|
||||||
docker run --rm -e "BUILD_TAGS=$BUILD_TAGS" -v "$(pwd)":/go/src/github.com/tendermint/${REPO_NAME} tendermint/${REPO_NAME}-builder ./scripts/dist_build.sh
|
docker run --rm -e "BUILD_TAGS=$BUILD_TAGS" -v "$(pwd)":/go/src/github.com/tendermint/${REPO_NAME} tendermint/${REPO_NAME}-builder ./scripts/dist_build.sh
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
#! /bin/bash
|
||||||
|
|
||||||
|
# Get the version from the environment, or try to figure it out.
|
||||||
|
if [ -z $VERSION ]; then
|
||||||
|
VERSION=$(awk -F\" '/Version =/ { print $2; exit }' < version/version.go)
|
||||||
|
fi
|
||||||
|
aws s3 cp --recursive build/dist s3://tendermint/binaries/basecoin/v${VERSION} --acl public-read
|
|
@ -2,6 +2,6 @@ package version
|
||||||
|
|
||||||
const Maj = "0"
|
const Maj = "0"
|
||||||
const Min = "5"
|
const Min = "5"
|
||||||
const Fix = "1"
|
const Fix = "2"
|
||||||
|
|
||||||
const Version = "0.5.1"
|
const Version = "0.5.2"
|
||||||
|
|
Loading…
Reference in New Issue