Merge pull request containernetworking#326 from squeed/bump-release-go

Release: bump go to v1.12
chenleji · May 29, 2019 · fe60fcd · fe60fcd
2 parents e308211 + 29a431f
commit fe60fcd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,8 @@ sudo: required
 dist: trusty
 
 go:
- - 1.10.x
  - 1.11.x
+ - 1.12.x
 
 env:
  global:
@@ -23,10 +23,10 @@ matrix:
  include:
  - os: windows
  env: TARGET=amd64
- go: 1.10.x
+ go: 1.11.x
  - os: windows
  env: TARGET=amd64
- go: 1.11.x
+ go: 1.12.x
 
 install:
  - go get github.com/onsi/ginkgo/ginkgo

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -16,7 +16,7 @@ rm -Rf ${SRC_DIR}/${RELEASE_DIR}
 mkdir -p ${SRC_DIR}/${RELEASE_DIR}
 mkdir -p ${OUTPUT_DIR}
 
-$DOCKER run -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins --rm golang:1.10-alpine \
+$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins --rm golang:1.12-alpine \
 /bin/sh -xe -c "\
  apk --no-cache add bash tar;
  cd /go/src/github.com/containernetworking/plugins; umask 0022;