Skip to content

Commit

Permalink
Merge pull request #6367 from thaJeztah/1.5_bump_go_1.16.12
Browse files Browse the repository at this point in the history
[release/1.5] Update Go to 1.16.12
  • Loading branch information
fuweid committed Dec 12, 2021
2 parents e7d4349 + 8c24a61 commit 63c9773
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
go-version: [1.16.11]
go-version: [1.16.12]
os: [ubuntu-18.04, macos-10.15, windows-2019]

steps:
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.11'
go-version: '1.16.12'

- shell: bash
run: |
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.11'
go-version: '1.16.12'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.11'
go-version: '1.16.12'

- name: Set env
shell: bash
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.11'
go-version: '1.16.12'
- name: Set env
shell: bash
run: |
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-18.04, macos-10.15, windows-2019]
go-version: ['1.16.11']
go-version: ['1.16.12']
include:
# Go 1.13.x is still used by Docker/Moby
- go-version: '1.13.x'
Expand Down Expand Up @@ -272,7 +272,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.11'
go-version: '1.16.12'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -353,7 +353,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.11'
go-version: '1.16.12'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -505,7 +505,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.11'
go-version: '1.16.12'
- uses: actions/checkout@v2
with:
path: src/github.com/containerd/containerd
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.11'
go-version: '1.16.12'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.11'
go-version: '1.16.12'

- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: '1.16.11'
go-version: '1.16.12'

- name: Set env
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .zuul/playbooks/containerd-build/integration-test.yaml
Expand Up @@ -2,7 +2,7 @@
become: yes
roles:
- role: config-golang
go_version: '1.16.11'
go_version: '1.16.12'
arch: arm64
tasks:
- name: Install pre-requisites
Expand Down
2 changes: 1 addition & 1 deletion .zuul/playbooks/containerd-build/run.yaml
Expand Up @@ -2,7 +2,7 @@
become: yes
roles:
- role: config-golang
go_version: '1.16.11'
go_version: '1.16.12'
arch: arm64
tasks:
- name: Build containerd
Expand Down
2 changes: 1 addition & 1 deletion .zuul/playbooks/containerd-build/unit-test.yaml
Expand Up @@ -2,7 +2,7 @@
become: yes
roles:
- role: config-golang
go_version: '1.16.11'
go_version: '1.16.12'
arch: arm64
tasks:
- name: Build and test containerd
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Expand Up @@ -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.11",
'GO_VERSION': ENV['GO_VERSION'] || "1.16.12",
}
sh.inline = <<~SHELL
#!/usr/bin/env bash
Expand Down
2 changes: 1 addition & 1 deletion contrib/Dockerfile.test
Expand Up @@ -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.11
ARG GOLANG_VERSION=1.16.12

FROM golang:${GOLANG_VERSION} AS golang-base
RUN mkdir -p /go/src/github.com/containerd/containerd
Expand Down

0 comments on commit 63c9773

Please sign in to comment.