Update Go to 1.17.5

go1.17.5 (released 2021-12-09) includes security fixes to the syscall and net/http
packages. See the Go 1.17.5 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.17.5+label%3ACherryPickApproved

Update Go to 1.17.4
--------------------

go1.17.4 (released 2021-12-02) includes fixes to the compiler, linker, runtime,
and the go/types, net/http, and time packages. See the Go 1.17.4 milestone on
the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.17.4+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2021-12-06 11:16:42 +01:00
parent 4236f6b225
commit 0e472420bf
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
11 changed files with 20 additions and 20 deletions

View File

@ -39,7 +39,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.3' go-version: '1.17.5'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

View File

@ -20,7 +20,7 @@ jobs:
strategy: strategy:
matrix: matrix:
go-version: [1.17.3] go-version: [1.17.5]
os: [ubuntu-18.04, macos-10.15, windows-2019] os: [ubuntu-18.04, macos-10.15, windows-2019]
steps: steps:
@ -46,7 +46,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.3' go-version: '1.17.5'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -78,7 +78,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.3' go-version: '1.17.5'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -110,7 +110,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.3' go-version: '1.17.5'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1 - run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1
- run: make man - run: make man
@ -144,7 +144,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.3' go-version: '1.17.5'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: | - run: |
set -e -x set -e -x
@ -201,7 +201,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022] os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022]
go-version: ['1.17.3'] go-version: ['1.17.5']
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
@ -248,7 +248,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.3' go-version: '1.17.5'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -330,7 +330,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.3' go-version: '1.17.5'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -449,7 +449,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.3' go-version: '1.17.5'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: sudo -E PATH=$PATH script/setup/install-gotestsum - run: sudo -E PATH=$PATH script/setup/install-gotestsum
- name: Tests - name: Tests

View File

@ -24,7 +24,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.3' go-version: '1.17.5'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

View File

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

View File

@ -64,7 +64,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: '1.17.3' go-version: '1.17.5'
- name: Set env - name: Set env
shell: bash shell: bash
env: env:

View File

@ -2,7 +2,7 @@
become: yes become: yes
roles: roles:
- role: config-golang - role: config-golang
go_version: '1.17.3' go_version: '1.17.4'
arch: arm64 arch: arm64
tasks: tasks:
- name: Install pre-requisites - name: Install pre-requisites

View File

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

View File

@ -2,7 +2,7 @@
become: yes become: yes
roles: roles:
- role: config-golang - role: config-golang
go_version: '1.17.3' go_version: '1.17.4'
arch: arm64 arch: arm64
tasks: tasks:
- name: Build and test containerd - name: Build and test 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| config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
sh.upload_path = "/tmp/vagrant-install-golang" sh.upload_path = "/tmp/vagrant-install-golang"
sh.env = { sh.env = {
'GO_VERSION': ENV['GO_VERSION'] || "1.17.3", 'GO_VERSION': ENV['GO_VERSION'] || "1.17.5",
} }
sh.inline = <<~SHELL sh.inline = <<~SHELL
#!/usr/bin/env bash #!/usr/bin/env bash

View File

@ -10,7 +10,7 @@
# #
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../ # docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../
ARG GOLANG_VERSION=1.17.3 ARG GOLANG_VERSION=1.17.5
ARG GOLANG_IMAGE=golang ARG GOLANG_IMAGE=golang
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

View File

@ -1,6 +1,6 @@
# Prepare windows environment for building and running containerd tests # Prepare windows environment for building and running containerd tests
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.17.3"; make = ""; nssm = "" } $PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.17.5"; make = ""; nssm = "" }
Write-Host "Downloading chocolatey package" Write-Host "Downloading chocolatey package"
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip' curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'