Merge pull request #5461 from tao12345666333/update-go-1.16.4

Update Go to 1.16.4
This commit is contained in:
Akihiro Suda 2021-05-07 15:33:34 +09:00 committed by GitHub
commit 087d03bc55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions

View File

@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
go-version: [1.16.3]
go-version: [1.16.4]
os: [ubuntu-18.04, macos-10.15, windows-2019]
steps:
@ -73,7 +73,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.3'
go-version: '1.16.4'
- uses: actions/checkout@v2
with:
@ -106,7 +106,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.3'
go-version: '1.16.4'
- name: Set env
shell: bash
@ -152,7 +152,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.3'
go-version: '1.16.4'
- name: Set env
shell: bash
run: |
@ -217,7 +217,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-18.04, macos-10.15, windows-2019]
go-version: ['1.16.3']
go-version: ['1.16.4']
include:
# Go 1.13.x is still used by Docker/Moby
- go-version: '1.13.x'
@ -263,7 +263,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.3'
go-version: '1.16.4'
- uses: actions/checkout@v2
with:
@ -344,7 +344,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.3'
go-version: '1.16.4'
- uses: actions/checkout@v2
with:
@ -496,7 +496,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.3'
go-version: '1.16.4'
- uses: actions/checkout@v2
with:

View File

@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.3'
go-version: '1.16.4'
- uses: actions/checkout@v2
with:
@ -135,7 +135,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.3'
go-version: '1.16.4'
- uses: actions/checkout@v2
with:

View File

@ -62,7 +62,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: '1.16.3'
go-version: '1.16.4'
- name: Set env
shell: bash

View File

@ -2,7 +2,7 @@
become: yes
roles:
- role: config-golang
go_version: '1.16.3'
go_version: '1.16.4'
arch: arm64
tasks:
- name: Build containerd

2
Vagrantfile vendored
View File

@ -77,7 +77,7 @@ Vagrant.configure("2") do |config|
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
sh.upload_path = "/tmp/vagrant-install-golang"
sh.env = {
'GO_VERSION': ENV['GO_VERSION'] || "1.16.3",
'GO_VERSION': ENV['GO_VERSION'] || "1.16.4",
}
sh.inline = <<~SHELL
#!/usr/bin/env bash

View File

@ -10,7 +10,7 @@
#
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc93 -f Dockerfile.test ../
ARG GOLANG_VERSION=1.16.3
ARG GOLANG_VERSION=1.16.4
FROM golang:${GOLANG_VERSION} AS golang-base
RUN mkdir -p /go/src/github.com/containerd/containerd