Skip to content

Commit 1219e65

Browse files
authored
Update SDK CI and sandbox tests for Go 1.15 (#3482)
Adds Go 1.15 to CI tests, and creates sandbox test environments for missing go versions.
1 parent 075753b commit 1219e65

File tree

4 files changed

+46
-4
lines changed

4 files changed

+46
-4
lines changed

.travis.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ go:
1616
- 1.12.x
1717
- 1.13.x
1818
- 1.14.x
19+
- 1.15.x
1920
- tip
2021

2122
matrix:
@@ -35,6 +36,8 @@ matrix:
3536
go: 1.13.x
3637
- os: windows
3738
go: 1.14.x
39+
- os: windows
40+
go: 1.15.x
3841
- os: windows
3942
go: tip
4043

@@ -43,16 +46,17 @@ before_install:
4346

4447
script:
4548
- if [ -z $(go env GOMOD) ]; then
46-
if [ "$TRAVIS_GO_VERSION" == "1.12.x" ] ||
49+
if [ "$TRAVIS_GO_VERSION" == "1.13.x" ] ||
50+
[ "$TRAVIS_GO_VERSION" == "1.12.x" ] ||
4751
[ "$TRAVIS_GO_VERSION" == "1.11.x" ] ||
4852
[ "$TRAVIS_GO_VERSION" == "1.10.x" ]; then
4953
make get-deps-x-tests;
5054
fi;
5155
make get-deps;
5256
fi;
5357
if [ "$TRAVIS_GO_VERSION" == "tip" ] ||
54-
[ "$TRAVIS_GO_VERSION" == "1.14.x" ] ||
55-
[ "$TRAVIS_GO_VERSION" == "1.13.x" ]; then
58+
[ "$TRAVIS_GO_VERSION" == "1.15.x" ] ||
59+
[ "$TRAVIS_GO_VERSION" == "1.14.x" ]; then
5660

5761
if [ "$TRAVIS_OS_NAME" = "windows" ]; then
5862
make unit-no-verify;

Makefile

+15-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ cleanup-integ-buckets:
108108
###################
109109
# Sandbox Testing #
110110
###################
111-
sandbox-tests: sandbox-test-go1.5 sandbox-test-go1.6 sandbox-test-go1.7 sandbox-test-go1.8 sandbox-test-go1.9 sandbox-test-go1.10 sandbox-test-go1.11 sandbox-test-go1.12 sandbox-test-gotip
111+
sandbox-tests: sandbox-test-go1.5 sandbox-test-go1.6 sandbox-test-go1.7 sandbox-test-go1.8 sandbox-test-go1.9 sandbox-test-go1.10 sandbox-test-go1.11 sandbox-test-go1.12 sandbox-test-go1.13 sandbox-test-go1.14 sandbox-test-go1.15 sandbox-test-gotip
112112

113113
sandbox-build-go1.5:
114114
docker build -f ./awstesting/sandbox/Dockerfile.test.go1.5 -t "aws-sdk-go-1.5" .
@@ -173,6 +173,20 @@ sandbox-go1.13: sandbox-build-go1.13
173173
sandbox-test-go1.13: sandbox-build-go1.13
174174
docker run -t aws-sdk-go-1.13
175175

176+
sandbox-build-go1.14:
177+
docker build -f ./awstesting/sandbox/Dockerfile.test.go1.14 -t "aws-sdk-go-1.14" .
178+
sandbox-go1.14: sandbox-build-go1.14
179+
docker run -i -t aws-sdk-go-1.14 bash
180+
sandbox-test-go1.14: sandbox-build-go1.14
181+
docker run -t aws-sdk-go-1.14
182+
183+
sandbox-build-go1.15:
184+
docker build -f ./awstesting/sandbox/Dockerfile.test.go1.15 -t "aws-sdk-go-1.15" .
185+
sandbox-go1.15: sandbox-build-go1.15
186+
docker run -i -t aws-sdk-go-1.15 bash
187+
sandbox-test-go1.15: sandbox-build-go1.15
188+
docker run -t aws-sdk-go-1.15
189+
176190
sandbox-build-gotip:
177191
@echo "Run make update-aws-golang-tip, if this test fails because missing aws-golang:tip container"
178192
docker build -f ./awstesting/sandbox/Dockerfile.test.gotip -t "aws-sdk-go-tip" .
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM golang:1.14
2+
3+
ENV GOPROXY=direct
4+
5+
ADD . /go/src/github.com/aws/aws-sdk-go
6+
7+
RUN apt-get update && apt-get install -y --no-install-recommends \
8+
vim \
9+
&& rm -rf /var/list/apt/lists/*
10+
11+
WORKDIR /go/src/github.com/aws/aws-sdk-go
12+
CMD ["make", "get-deps-verify", "unit"]
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM golang:1.15
2+
3+
ENV GOPROXY=direct
4+
5+
ADD . /go/src/github.com/aws/aws-sdk-go
6+
7+
RUN apt-get update && apt-get install -y --no-install-recommends \
8+
vim \
9+
&& rm -rf /var/list/apt/lists/*
10+
11+
WORKDIR /go/src/github.com/aws/aws-sdk-go
12+
CMD ["make", "get-deps-verify", "unit"]

0 commit comments

Comments
 (0)