Skip to content

Commit a0e63ed

Browse files
committed
update travis tests to be aware of gomod
1 parent 5661c29 commit a0e63ed

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.travis.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,21 @@ before_install:
4040
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install make; fi
4141

4242
script:
43-
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then
43+
- if [ $TRAVIS_GO_VERSION == "1.12.x" ] ||
44+
[ $TRAVIS_GO_VERSION == "1.11.x" ] ||
45+
[ $TRAVIS_GO_VERSION == "1.10.x" ]; then
46+
make get-deps-x-tests;
47+
fi
48+
- if [ -z $(go env GOMOD) ]; then
4449
make get-deps;
50+
fi
51+
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then
4552
make unit-no-verify;
4653
else
47-
if [ $TRAVIS_GO_VERSION == "1.13.x" ] ||
48-
[ $TRAVIS_GO_VERSION == "tip" ]; then
49-
make ci-test;
54+
if [ ! -z $(go env GOMOD) ]; then
55+
make ci-test;
5056
else
51-
make get-deps;
52-
make unit-old-go-race-cover;
57+
make unit-old-go-race-cover;
5358
fi
5459
fi
5560

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@ get-deps:
205205
@echo "getting pre go module dependnecies"
206206
go get github.com/jmespath/go-jmespath
207207

208+
get-deps-x-tests:
209+
@echo "go get SDK testing golang.org/x dependencies"
210+
go get golang.org/x/net/http2
211+
208212
##############
209213
# Benchmarks #
210214
##############

0 commit comments

Comments
 (0)