Skip to content

Commit ea5a477

Browse files
authored
Merge pull request #9352 from thaJeztah/1.7_update_golang_1.20.11
[release/1.7] update to go1.20.12, test go1.21.5
2 parents 67d356c + 0d31440 commit ea5a477

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed

.github/workflows/build-test-images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
steps:
4444
- uses: actions/setup-go@v3
4545
with:
46-
go-version: "1.20.10"
46+
go-version: "1.20.12"
4747

4848
- uses: actions/checkout@v3
4949
with:

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
env:
1313
# Go version we currently use to build containerd across all CI.
1414
# Note: don't forget to update `Binaries` step, as it contains the matrix of all supported Go versions.
15-
GO_VERSION: "1.20.10"
15+
GO_VERSION: "1.20.12"
1616

1717
permissions: # added using https://github.com/step-security/secure-workflows
1818
contents: read
@@ -207,7 +207,7 @@ jobs:
207207
strategy:
208208
matrix:
209209
os: [ubuntu-20.04, macos-12, windows-2019, windows-2022]
210-
go-version: ["1.20.10", "1.21.3"]
210+
go-version: ["1.20.12", "1.21.5"]
211211
steps:
212212
- uses: actions/setup-go@v3
213213
with:

.github/workflows/codeql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- uses: actions/setup-go@v3
3636
with:
37-
go-version: 1.20.10
37+
go-version: 1.20.12
3838

3939
# Initializes the CodeQL tools for scanning.
4040
- name: Initialize CodeQL

.github/workflows/images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/setup-go@v3
3030
with:
31-
go-version: "1.20.10"
31+
go-version: "1.20.12"
3232

3333
- uses: actions/checkout@v3
3434
with:

.github/workflows/nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- ".github/workflows/nightly.yml"
88

99
env:
10-
GO_VERSION: "1.20.10"
10+
GO_VERSION: "1.20.12"
1111

1212
permissions: # added using https://github.com/step-security/secure-workflows
1313
contents: read

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
name: Release
1414

1515
env:
16-
GO_VERSION: "1.20.10"
16+
GO_VERSION: "1.20.12"
1717

1818
permissions: # added using https://github.com/step-security/secure-workflows
1919
contents: read

Vagrantfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ EOF
102102
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
103103
sh.upload_path = "/tmp/vagrant-install-golang"
104104
sh.env = {
105-
'GO_VERSION': ENV['GO_VERSION'] || "1.20.10",
105+
'GO_VERSION': ENV['GO_VERSION'] || "1.20.12",
106106
}
107107
sh.inline = <<~SHELL
108108
#!/usr/bin/env bash

contrib/Dockerfile.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# docker run --privileged containerd-test
3030
# ------------------------------------------------------------------------------
3131

32-
ARG GOLANG_VERSION=1.20.10
32+
ARG GOLANG_VERSION=1.20.12
3333
ARG GOLANG_IMAGE=golang
3434

3535
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

script/setup/prepare_env_windows.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# lived test environment.
66
Set-MpPreference -DisableRealtimeMonitoring:$true
77

8-
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.20.10"; make = ""; nssm = "" }
8+
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.20.12"; make = ""; nssm = "" }
99

1010
Write-Host "Downloading chocolatey package"
1111
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'

0 commit comments

Comments
 (0)