Skip to content

Commit

Permalink
Merge pull request #3620 from thaJeztah/update_go_1.13
Browse files Browse the repository at this point in the history
Update to Golang 1.13.4
  • Loading branch information
mxpv committed Nov 10, 2019
2 parents 40ac923 + 608791b commit d1bcb4b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .travis.yml
Expand Up @@ -10,21 +10,21 @@ 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:
# Skip testing previous LTS (Xenial / Ubuntu 16.04 LTS) on pull requests
- 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

Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion contrib/Dockerfile.test
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d1bcb4b

Please sign in to comment.