Skip to content

Commit

Permalink
Merge pull request #5990 from estesp/update-go-1.17.1
Browse files Browse the repository at this point in the history
Update to Go 1.17.1
  • Loading branch information
AkihiroSuda committed Sep 14, 2021
2 parents cbf9d88 + 73dbbf5 commit 493220b
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

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

steps:
Expand All @@ -46,7 +46,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.17.1'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.17.1'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.17.1'
- uses: actions/checkout@v2
- run: go get github.com/cpuguy83/go-md2man/v2@v2.0.1
- run: make man
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.17.1'
- uses: actions/checkout@v2
- run: |
set -e -x
Expand Down Expand Up @@ -202,7 +202,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-18.04, macos-10.15, windows-2019]
go-version: ['1.17']
go-version: ['1.17.1']

steps:
- uses: actions/setup-go@v2
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.17.1'

- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -325,7 +325,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.17.1'

- uses: actions/checkout@v2

Expand Down Expand Up @@ -444,7 +444,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.17.1'
- uses: actions/checkout@v2
- run: sudo -E PATH=$PATH script/setup/install-gotestsum
- name: Tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.17.1'

- 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'
go-version: '1.17.1'

- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: '1.17'
go-version: '1.17.1'

- name: Set env
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .zuul/playbooks/containerd-build/integration-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
become: yes
roles:
- role: config-golang
go_version: '1.17'
go_version: '1.17.1'
arch: arm64
tasks:
- name: Install pre-requisites
Expand Down
2 changes: 1 addition & 1 deletion .zuul/playbooks/containerd-build/run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
become: yes
roles:
- role: config-golang
go_version: '1.17'
go_version: '1.17.1'
arch: arm64
tasks:
- name: Build containerd
Expand Down
2 changes: 1 addition & 1 deletion .zuul/playbooks/containerd-build/unit-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
become: yes
roles:
- role: config-golang
go_version: '1.17'
go_version: '1.17.1'
arch: arm64
tasks:
- name: Build and test containerd
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
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",
'GO_VERSION': ENV['GO_VERSION'] || "1.17.1",
}
sh.inline = <<~SHELL
#!/usr/bin/env bash
Expand Down
2 changes: 1 addition & 1 deletion contrib/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../

ARG GOLANG_VERSION=1.17
ARG GOLANG_VERSION=1.17.1
ARG GOLANG_IMAGE=golang

FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang
Expand Down

0 comments on commit 493220b

Please sign in to comment.