Merge pull request #4463 from thaJeztah/1.3_backport_bump_golang_1.13.15

AkihiroSuda · web-flow · commit 6c71fe1c400c · 2020-08-10T19:19:04.000+09:00
[release/1.3 backport] Bump Golang 1.13.15
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v1
         with:
-          go-version: '1.13.12'
+          go-version: '1.13.15'
 
       - name: Set env
         shell: bash
@@ -66,7 +66,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v1
         with:
-          go-version: '1.13.12'
+          go-version: '1.13.15'
 
       - name: Set env
         shell: bash
@@ -138,7 +138,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: '1.13.12'
+          go-version: '1.13.15'
 
       - name: Set env
         shell: bash
@@ -185,7 +185,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v1
         with:
-          go-version: '1.13.12'
+          go-version: '1.13.15'
 
       - name: Set env
         shell: bash
@@ -222,7 +222,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v1
         with:
-          go-version: '1.13.12'
+          go-version: '1.13.15'
 
       - name: Set env
         shell: bash
@@ -264,7 +264,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v1
         with:
-          go-version: '1.13.12'
+          go-version: '1.13.15'
 
       - name: Setup gosu
         shell: bash
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -62,7 +62,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v1
         with:
-          go-version: '1.13.12'
+          go-version: '1.13.15'
 
       - name: Set env
         shell: bash
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ os:
 - linux
 
 go:
-  - "1.13.12"
+  - "1.13.15"
 
 env:
   - TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct
diff --git a/.zuul/playbooks/containerd-build/run.yaml b/.zuul/playbooks/containerd-build/run.yaml
@@ -1,20 +1,23 @@
 - hosts: all
   become: yes
   roles:
-    - role: config-golang
-      arch: arm64
+  - role: config-golang
+    go_version: '1.13.15'
+    arch: arm64
   tasks:
-    - name: Build containerd
-      shell:
-        cmd: |
-          set -xe
-          apt-get update
-          apt-get install -y btrfs-tools libseccomp-dev git pkg-config
+  - name: Build containerd
+    shell:
+      cmd: |
+        set -xe
+        set -o pipefail
+        apt-get update
+        apt-get install -y btrfs-tools libseccomp-dev git pkg-config
 
-          make | tee $LOGS_PATH/make.txt
-          make test | tee $LOGS_PATH/make_test.txt
+        go version
+        make | tee $LOGS_PATH/make.txt
+        make test | tee $LOGS_PATH/make_test.txt
 
-          cp -r ./bin $RESULTS_PATH
-        chdir: '{{ zuul.project.src_dir }}'
-        executable: /bin/bash
-      environment: '{{ global_env }}'
+        cp -r ./bin $RESULTS_PATH
+      chdir: '{{ zuul.project.src_dir }}'
+      executable: /bin/bash
+    environment: '{{ global_env }}'
diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
@@ -6,7 +6,7 @@
 # 3.) $ make binaries install test
 #
 
-ARG GOLANG_VERSION=1.13.12
+ARG GOLANG_VERSION=1.13.15
 
 FROM golang:${GOLANG_VERSION} AS golang-base
 RUN mkdir -p /go/src/github.com/containerd/containerd

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# 3.) $ make binaries install test`
`7`	`7`	`#`
`8`	`8`
`9`		`-ARG GOLANG_VERSION=1.13.12`
	`9`	`+ARG GOLANG_VERSION=1.13.15`
`10`	`10`
`11`	`11`	`FROM golang:${GOLANG_VERSION} AS golang-base`
`12`	`12`	`RUN mkdir -p /go/src/github.com/containerd/containerd`