Skip to content

Commit

Permalink
Merge pull request #100 from getamis/release/v1.0.0
Browse files Browse the repository at this point in the history
Release v1.0.0
  • Loading branch information
alanchchen authored Nov 24, 2017
2 parents f2c92e4 + 7e3e077 commit 3b7f431
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 18 deletions.
44 changes: 30 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand Down
4 changes: 0 additions & 4 deletions cmd/istanbul/setup/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 3b7f431

Please sign in to comment.