Skip to content

Commit

Permalink
Merge pull request #7014 from thaJeztah/1.5_bump_golang_1.17.11
Browse files Browse the repository at this point in the history
[release/1.5] update golang to 1.17.11
  • Loading branch information
dmcgowan committed Jun 2, 2022
2 parents ae4ec1f + 3f61d5e commit 6b8cb51
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.17.10]
go-version: [1.17.11]
os: [ubuntu-18.04, macos-10.15, windows-2019]

steps:
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17.10'
go-version: '1.17.11'

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

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17.10'
go-version: '1.17.11'

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

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -357,7 +357,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17.10'
go-version: '1.17.11'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -509,7 +509,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17.10'
go-version: '1.17.11'
- 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.17.10'
go-version: '1.17.11'

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

- 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.17.10'
go-version: '1.17.11'

- 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.17.10'
go_version: '1.17.11'
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.17.10'
go_version: '1.17.11'
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.17.10'
go_version: '1.17.11'
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.17.10",
'GO_VERSION': ENV['GO_VERSION'] || "1.17.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.17.10
ARG GOLANG_VERSION=1.17.11

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

0 comments on commit 6b8cb51

Please sign in to comment.