diff --git a/.appveyor.yml b/.appveyor.yml index 14ef3101f..fd465a80b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,7 +12,7 @@ environment: GOPATH: C:\gopath CGO_ENABLED: 1 matrix: - - GO_VERSION: 1.12.13 + - GO_VERSION: 1.13.4 before_build: - choco install -y mingw --version 5.3.0 diff --git a/.travis.yml b/.travis.yml index d087f2536..390ee0533 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,13 @@ os: - linux go: - - "1.12.13" + - "1.13.4" env: - - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic - - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic TRAVIS_RELEASE=yes - - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runtime.v1.linux TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic - - TRAVIS_GOOS=darwin TRAVIS_CGO_ENABLED=0 + - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct + - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic TRAVIS_RELEASE=yes GOPROXY=direct + - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runtime.v1.linux TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct + - TRAVIS_GOOS=darwin TRAVIS_CGO_ENABLED=0 GOPROXY=direct matrix: include: @@ -24,7 +24,7 @@ matrix: - if: type != pull_request os: linux dist: xenial - env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=xenial + env: TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v2 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=xenial GOPROXY=direct go_import_path: github.com/containerd/containerd @@ -73,7 +73,7 @@ script: - DCO_VERBOSITY=-q ../project/script/validate/dco - ../project/script/validate/fileheader ../project/ - travis_wait ../project/script/validate/vendor - - GOOS=linux script/setup/install-dev-tools + - GOOS=linux GO111MODULE=off script/setup/install-dev-tools - go build -i . - make check - if [ "$GOOS" = "linux" ]; then make check-protos check-api-descriptors; fi diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test index ba89e6d61..4380aa6ee 100644 --- a/contrib/Dockerfile.test +++ b/contrib/Dockerfile.test @@ -6,7 +6,7 @@ # 3.) $ make binaries install test # -ARG GOLANG_VERSION=1.12.13 +ARG GOLANG_VERSION=1.13.4 FROM golang:${GOLANG_VERSION} AS golang-base RUN mkdir -p /go/src/github.com/containerd/containerd @@ -34,6 +34,8 @@ RUN apt-get update && apt-get install -y \ COPY vendor.conf vendor.conf COPY script/setup/install-runc install-runc +ARG GOPROXY=direct +ARG GO111MODULE=off RUN ./install-runc FROM golang-base AS dev