Browse Source

Merge pull request #136 from tendermint/update-go-version-and-deps

Update go version and deps
pull/1780/head
Anton Kaliaev 7 years ago
committed by GitHub
parent
commit
bf34c378e9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 10 deletions
  1. +3
    -3
      Makefile
  2. +3
    -3
      glide.lock
  3. +1
    -1
      scripts/abci-builder/Dockerfile
  4. +1
    -1
      tests/test_app/app.go
  5. +1
    -1
      tests/test_app/test.sh
  6. +1
    -1
      tests/test_cli/test.sh

+ 3
- 3
Makefile View File

@ -5,7 +5,7 @@ GOTOOLS = \
all: protoc install test all: protoc install test
NOVENDOR = go list github.com/tendermint/abci/... | grep -v /vendor/
PACKAGES=$(shell go list ./... | grep -v '/vendor/')
install-protoc: install-protoc:
# Download: https://github.com/google/protobuf/releases # Download: https://github.com/google/protobuf/releases
@ -27,7 +27,7 @@ dist:
# test.sh requires that we run the installed cmds, must not be out of date # test.sh requires that we run the installed cmds, must not be out of date
test: install test: install
find . -path ./vendor -prune -o -name *.sock -exec rm {} \; find . -path ./vendor -prune -o -name *.sock -exec rm {} \;
@ go test -p 1 `${NOVENDOR}`
@ go test $(PACKAGES)
@ bash tests/test.sh @ bash tests/test.sh
fmt: fmt:
@ -36,7 +36,7 @@ fmt:
test_integrations: get_vendor_deps install test test_integrations: get_vendor_deps install test
get_deps: get_deps:
@ go get -d `${NOVENDOR}`
@ go get -d $(PACKAGES)
tools: tools:
go get -u -v $(GOTOOLS) go get -u -v $(GOTOOLS)


+ 3
- 3
glide.lock View File

@ -1,5 +1,5 @@
hash: 5501ab3d7136aa8fb425c995d45221849b33aefab76c5d2c192e721dad28da38 hash: 5501ab3d7136aa8fb425c995d45221849b33aefab76c5d2c192e721dad28da38
updated: 2017-11-08T22:19:19.433856551Z
updated: 2017-11-14T18:23:41.2024073Z
imports: imports:
- name: github.com/btcsuite/btcd - name: github.com/btcsuite/btcd
version: b8df516b4b267acf2de46be593a9d948d1d2c420 version: b8df516b4b267acf2de46be593a9d948d1d2c420
@ -68,13 +68,13 @@ imports:
- name: github.com/tendermint/go-crypto - name: github.com/tendermint/go-crypto
version: b4f04f196cd719660e43b91202cd60d9a95b1837 version: b4f04f196cd719660e43b91202cd60d9a95b1837
- name: github.com/tendermint/go-wire - name: github.com/tendermint/go-wire
version: 2baffcb6b690057568bc90ef1d457efb150b979a
version: 1c96861c03231361546944d883d99593b2e6b408
subpackages: subpackages:
- data - data
- name: github.com/tendermint/iavl - name: github.com/tendermint/iavl
version: 595f3dcd5b6cd4a292e90757ae6d367fd7a6e653 version: 595f3dcd5b6cd4a292e90757ae6d367fd7a6e653
- name: github.com/tendermint/tmlibs - name: github.com/tendermint/tmlibs
version: 176c2ceed611d7735e39131e312bd973afb41b7b
version: 2442a0a698d271d5cf5d6a8e7c1db20335e959c1
subpackages: subpackages:
- common - common
- db - db


+ 1
- 1
scripts/abci-builder/Dockerfile View File

@ -1,4 +1,4 @@
FROM golang:1.7.4
FROM golang:1.9.2
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
zip \ zip \


+ 1
- 1
tests/test_app/app.go View File

@ -18,7 +18,7 @@ func startApp(abciApp string) *process.Process {
proc, err := process.StartProcess("abci_app", proc, err := process.StartProcess("abci_app",
"", "",
"bash", "bash",
[]string{"-c", abciApp},
[]string{"-c", fmt.Sprintf("abci-cli %s", abciApp)},
nil, nil,
os.Stdout, os.Stdout,
) )


+ 1
- 1
tests/test_app/test.sh View File

@ -15,7 +15,7 @@ cd "$DIR"
ABCI_APP="counter" go run ./*.go ABCI_APP="counter" go run ./*.go
# test golang counter via grpc # test golang counter via grpc
ABCI_APP="counter -abci=grpc" ABCI="grpc" go run ./*.go
ABCI_APP="counter --abci=grpc" ABCI="grpc" go run ./*.go
# test nodejs counter # test nodejs counter
# TODO: fix node app # TODO: fix node app


+ 1
- 1
tests/test_cli/test.sh View File

@ -17,7 +17,7 @@ function testExample() {
$APP &> /dev/null & $APP &> /dev/null &
sleep 2 sleep 2
abci-cli --verbose batch < "$INPUT" > "${INPUT}.out.new" abci-cli --verbose batch < "$INPUT" > "${INPUT}.out.new"
killall $3
killall "$3"
pre=$(shasum < "${INPUT}.out") pre=$(shasum < "${INPUT}.out")
post=$(shasum < "${INPUT}.out.new") post=$(shasum < "${INPUT}.out.new")


Loading…
Cancel
Save