File tree Expand file tree Collapse file tree 3 files changed +39
-21
lines changed Expand file tree Collapse file tree 3 files changed +39
-21
lines changed Original file line number Diff line number Diff line change 1
1
language : go
2
2
3
- sudo : required
4
-
5
- go :
6
- - 1.5
7
- - 1.6
8
- - 1.7
9
- - 1.8
10
- - 1.9
11
- - tip
12
-
13
- # Use Go 1.5's vendoring experiment for 1.5 tests.
14
- env :
15
- - GO15VENDOREXPERIMENT=1
16
-
17
- install :
18
- - make get-deps
3
+ matrix :
4
+ allow_failures :
5
+ - go : tip
6
+ include :
7
+ - os : linux
8
+ sudo : required
9
+ - os : linux
10
+ sudo : required
11
+ go : 1.9.x
12
+ - os : linux
13
+ sudo : required
14
+ go : 1.10.x
15
+ - os : linux
16
+ sudo : required
17
+ go : tip
18
+ - os : osx
19
+ go : 1.9.x
20
+ - os : osx
21
+ go : 1.10.x
22
+ - os : osx
23
+ go : tip
19
24
20
25
script :
21
- - make unit-with-race-cover
26
+ - make ci-test
22
27
23
- matrix :
24
- allow_failures :
25
- - go : tip
28
+ branches :
29
+ only :
30
+ - master
Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ SDK_ONLY_PKGS=$(shell go list ./... | grep -v "/vendor/")
13
13
SDK_UNIT_TEST_ONLY_PKGS =$(shell go list -tags ${UNIT_TEST_TAGS} ./... | grep -v "/vendor/")
14
14
SDK_GO_1_4 =$(shell go version | grep "go1.4")
15
15
SDK_GO_1_5 =$(shell go version | grep "go1.5")
16
+ SDK_GO_1_6 =$(shell go version | grep "go1.6")
16
17
SDK_GO_VERSION =$(shell go version | awk '''{print $$3}''' | tr -d '''\n''')
17
18
SDK_V1_USAGE =$(shell go list -f '''{{ if not .Standard }}{{ range $$_, $$name := .Imports }} * {{ $$.ImportPath }} -> {{ $$name }}{{ print "\n" }}{{ end }}{{ end }}''' ./... | sort -u | grep '''/aws-sdk-go/''')
18
19
@@ -65,6 +66,18 @@ unit-with-race-cover: get-deps-tests build verify
65
66
@echo " go test SDK and vendor packages"
66
67
@go test -tags ${UNIT_TEST_TAGS} -race -cpu=1,2,4 $(SDK_UNIT_TEST_ONLY_PKGS )
67
68
69
+ ci-test : ci-test-generate unit-with-race-cover ci-test-generate-validate
70
+
71
+ ci-test-generate : get-deps
72
+ @echo " CI test generated code"
73
+ @if [ \( -z " ${SDK_GO_1_6} " \) -a \( -z " ${SDK_GO_1_5} " \) ]; then make generate; else echo " skipping generate" ; fi
74
+
75
+ ci-test-generate-validate :
76
+ @echo " CI test validate no generated code changes"
77
+ @gitstatus=` if [ \( -z " ${SDK_GO_1_6} " \) -a \( -z " ${SDK_GO_1_5} " \) ]; then git status --porcelain; else echo " skipping validation" ; fi` ; \
78
+ echo " $$ gitstatus" ; \
79
+ if [ " $$ gitstatus" != " " ] && [ " $$ gitstatus" != " skipping validation" ]; then git diff; exit 1; fi
80
+
68
81
integration : get-deps-tests integ-custom smoke-tests performance
69
82
70
83
integ-custom :
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ phases:
12
12
- cd $SDK_GO_ROOT
13
13
- go get -u github.com/golang/dep/cmd/dep
14
14
- dep ensure
15
- - make unit
15
+ - make ci-test
16
16
- cd $SDK_CB_ROOT
17
17
post_build :
18
18
commands :
You can’t perform that action at this time.
0 commit comments