github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #3620 from thaJeztah/update_go_1.13

Browse Source 
Update to Golang 1.13.4
This commit is contained in:
Maksym Pavlenko 2019-11-10 10:56:21 -08:00 committed by GitHub
commit d1bcb4beea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -12,7 +12,7 @@ environment:
GOPATH: C:\gopath GOPATH: C:\gopath
CGO_ENABLED: 1 CGO_ENABLED: 1
matrix: matrix:
- GO_VERSION: 1.12.13 - GO_VERSION: 1.13.4
before_build: before_build:
- choco install -y mingw --version 5.3.0 - choco install -y mingw --version 5.3.0

14
.travis.yml
View File

@ -10,13 +10,13 @@ os:
- linux - linux
go: go:
- "1.12.13" - "1.13.4"
env: 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.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 - 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 - 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 - TRAVIS_GOOS=darwin TRAVIS_CGO_ENABLED=0 GOPROXY=direct
matrix: matrix:
include: include:
@ -24,7 +24,7 @@ matrix:
- if: type != pull_request - if: type != pull_request
os: linux os: linux
dist: xenial 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 go_import_path: github.com/containerd/containerd
@ -73,7 +73,7 @@ script:
- DCO_VERBOSITY=-q ../project/script/validate/dco - DCO_VERBOSITY=-q ../project/script/validate/dco
- ../project/script/validate/fileheader ../project/ - ../project/script/validate/fileheader ../project/
- travis_wait ../project/script/validate/vendor - 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 . - go build -i .
- make check - make check
- if [ "$GOOS" = "linux" ]; then make check-protos check-api-descriptors; fi - if [ "$GOOS" = "linux" ]; then make check-protos check-api-descriptors; fi

4
contrib/Dockerfile.test
View File

@ -6,7 +6,7 @@
# 3.) $ make binaries install test # 3.) $ make binaries install test
# #
ARG GOLANG_VERSION=1.12.13 ARG GOLANG_VERSION=1.13.4
FROM golang:${GOLANG_VERSION} AS golang-base FROM golang:${GOLANG_VERSION} AS golang-base
RUN mkdir -p /go/src/github.com/containerd/containerd 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 vendor.conf vendor.conf
COPY script/setup/install-runc install-runc COPY script/setup/install-runc install-runc
ARG GOPROXY=direct
ARG GO111MODULE=off
RUN ./install-runc RUN ./install-runc
FROM golang-base AS dev FROM golang-base AS dev