Skip to content

Commit

Permalink
Merge pull request #6335 from thaJeztah/1.4_bump_go_1.16.11
Browse files Browse the repository at this point in the history
[release/1.4] Update Go to 1.16.11
  • Loading branch information
dmcgowan committed Dec 6, 2021
2 parents 7b11cfa + e6eed07 commit a19dfa0
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: '1.16.10'
go-version: '1.16.11'

- name: Set env
shell: bash
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.10'
go-version: '1.16.11'

- name: Set env
shell: bash
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.10'
go-version: '1.16.11'

- name: Set env
shell: bash
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.10'
go-version: '1.16.11'

- name: Set env
shell: bash
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.10'
go-version: '1.16.11'

- name: Set env
shell: bash
Expand Down Expand Up @@ -285,7 +285,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.10'
go-version: '1.16.11'

- name: Set env
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.10'
go-version: '1.16.11'

- name: Checkout
uses: actions/checkout@v1
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.16.10'
go-version: '1.16.11'

- name: Checkout
uses: actions/checkout@v1
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.10'
go-version: '1.16.11'

- name: Set env
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -15,7 +15,7 @@ os:
- linux

go:
- "1.16.10"
- "1.16.11"

env:
- TRAVIS_GOOS=linux TEST_RUNTIME=io.containerd.runc.v1 TRAVIS_CGO_ENABLED=1 TRAVIS_DISTRO=bionic GOPROXY=direct
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.10'
go_version: '1.16.11'
arch: arm64
tasks:
- name: Build 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.10",
'GO_VERSION': ENV['GO_VERSION'] || "1.16.11",
}
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.10
ARG GOLANG_VERSION=1.16.11

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

0 comments on commit a19dfa0

Please sign in to comment.