Merge pull request #100 from getamis/release/v1.0.0

Release v1.0.0
This commit is contained in:
Alan Chen 2017-11-24 14:26:08 +08:00 committed by GitHub
commit 3b7f4317ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 18 deletions

View File

@ -1,11 +1,9 @@
language: go
go_import_path: github.com/getamis/istanbul-tools
sudo: required
os: linux
dist: trusty
go:
- 1.7.6
- 1.8.3
- 1.7
- 1.8
- 1.9
env:
- TEST=unit
- TEST=istanbul
@ -20,15 +18,33 @@ install:
script:
- 'if [ ${TEST} = "unit" ]; then
travis_wait 30 go test -v $(glide novendor | grep -v "\.\/tests\/\.\.\.") --timeout 30m;
elif [ ${TEST} = "istanbul" ]; then
cd ${TRAVIS_BUILD_DIR}/tests/functional && travis_wait 120 ginkgo -r --progress;
elif [ ${TEST} = "quorum" ]; then
cd ${TRAVIS_BUILD_DIR}/tests/quorum && travis_wait 120 ginkgo -r --progress;
else
echo "Invalid env"
exit 2;
fi'
travis_wait 30 go test -v $(glide novendor | grep -v "\.\/tests\/\.\.\.") --timeout 30m;
elif [ ${TEST} = "istanbul" ]; then
cd ${TRAVIS_BUILD_DIR}/tests/functional && travis_wait 120 ginkgo -r --progress;
elif [ ${TEST} = "quorum" ]; then
cd ${TRAVIS_BUILD_DIR}/tests/quorum && travis_wait 120 ginkgo -r --progress;
else
echo "Invalid env"
exit 2;
fi'
branches:
only:
- develop
jobs:
include:
- stage: release
go: 1.9
if: tag =~ ^v
env:
- TEST=none
- REV="$TRAVIS_TAG"
deploy:
provider: releases
api_key: "$GITHUB_OAUTH_TOKEN"
skip_cleanup: true
on:
tags: true
notifications:
webhooks:

View File

@ -123,10 +123,6 @@ func gen(ctx *cli.Context) error {
genesis.Alloc(addrs, new(big.Int).Exp(big.NewInt(10), big.NewInt(50), nil)),
)
jsonBytes, _ = json.MarshalIndent(g, "", " ")
fmt.Println("--Old genesis.json")
fmt.Println(string(jsonBytes))
if isQuorum {
jsonBytes, _ = json.MarshalIndent(genesis.ToQuorum(g, true), "", " ")
} else {