Skip to content

Commit

Permalink
Fix master build (#362)
Browse files Browse the repository at this point in the history
* fix master build

* update go version to 1.13.9 for travis build, check in go.sum

* fix version on golang tools

* user go 1.13.9

* fix ginkgo at v1.6.0

* fix travis yaml

* use -j 2 in travis build
  • Loading branch information
Jian Shen authored Mar 30, 2020
1 parent 765a163 commit f5e6dc3
Show file tree
Hide file tree
Showing 6 changed files with 309 additions and 9 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ coverage.*
junit.xml
.idea
.gopath
go.sum
.*.swp
*.coverprofile
*.a
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ install:
- .travis/install_golang_tools.sh
script:
- while sleep 2m; do echo "=====[ $SECONDS seconds, build still running... ]====="; done &
- make -j 2 travis
- make -j 2 lint
- make travis
- make lint
- kill %1
after_success:
# generate coverage output file
Expand Down
6 changes: 3 additions & 3 deletions .travis/install_golang_tools.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
set -ex
go get github.com/axw/gocov/gocov
go get github.com/axw/gocov/gocov@v1.0.0
go get github.com/AlekSi/gocov-xml
go get -u golang.org/x/lint/golint
go get -u github.com/onsi/ginkgo/ginkgo
go get -u github.com/onsi/ginkgo/ginkgo@v1.6.0
go get github.com/modocache/gover
go get github.com/mattn/goveralls
go get github.com/mattn/goveralls@v0.0.5
4 changes: 2 additions & 2 deletions .travis/run_unittest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ else
fi

# run test-cuda in host mode
make test-cuda -j
make test-cuda -j 2

# build binary
make aresd -j
make aresd -j 2

# run test
function run_skipped_package(){
Expand Down
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ require (
github.com/bkaradzic/go-lz4 v1.0.0 // indirect
github.com/chzyer/logex v1.1.10 // indirect
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
github.com/confluentinc/confluent-kafka-go v0.0.0-20190207113419-213e7cd9dd31
github.com/curator-go/curator v0.0.0-20180923140012-8a961ea3b252
github.com/emirpasic/gods v1.12.0
github.com/fatih/color v1.7.0
Expand Down
Loading

0 comments on commit f5e6dc3

Please sign in to comment.