Merge pull request #6102 from thaJeztah/bump_go_1.17.2

Update Go to 1.17.2
This commit is contained in:
Phil Estes 2021-10-08 10:44:22 -04:00 committed by GitHub
commit 88e1cf5fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 19 additions and 19 deletions

View File

@ -20,7 +20,7 @@ jobs:
strategy: strategy:
matrix: matrix:
go-version: [1.17.1] go-version: [1.17.2]
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.1' go-version: '1.17.2'
- 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.1' go-version: '1.17.2'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -111,7 +111,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.1' go-version: '1.17.2'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: go get github.com/cpuguy83/go-md2man/v2@v2.0.1 - run: go get github.com/cpuguy83/go-md2man/v2@v2.0.1
- run: make man - run: make man
@ -145,7 +145,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.1' go-version: '1.17.2'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: | - run: |
set -e -x set -e -x
@ -202,7 +202,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-18.04, macos-10.15, windows-2019] os: [ubuntu-18.04, macos-10.15, windows-2019]
go-version: ['1.17.1'] go-version: ['1.17.2']
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
@ -244,7 +244,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.1' go-version: '1.17.2'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -325,7 +325,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.1' go-version: '1.17.2'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -444,7 +444,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.17.1' go-version: '1.17.2'
- 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.1' go-version: '1.17.2'
- 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.1' go-version: '1.17.2'
- 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.1' go-version: '1.17.2'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

View File

@ -62,7 +62,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: '1.17.1' go-version: '1.17.2'
- name: Set env - name: Set env
shell: bash shell: bash

View File

@ -2,7 +2,7 @@
become: yes become: yes
roles: roles:
- role: config-golang - role: config-golang
go_version: '1.17.1' go_version: '1.17.2'
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.1' go_version: '1.17.2'
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.1' go_version: '1.17.2'
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.1", 'GO_VERSION': ENV['GO_VERSION'] || "1.17.2",
} }
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.1 ARG GOLANG_VERSION=1.17.2
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.1"; make = ""; nssm = "" } $PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.17.2"; 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'