Skip to content

Commit 25252e9

Browse files
authored
Merge pull request containerd#9623 from thaJeztah/update_golang_1.21.6
update to go1.21.6, go1.20.13
2 parents 5232e13 + a5d9587 commit 25252e9

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
steps:
4444
- uses: actions/setup-go@v5
4545
with:
46-
go-version: "1.21.5"
46+
go-version: "1.21.6"
4747

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

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
env:
1010
# Go version we currently use to build containerd across all CI.
1111
# Note: don't forget to update `Binaries` step, as it contains the matrix of all supported Go versions.
12-
GO_VERSION: "1.21.5"
12+
GO_VERSION: "1.21.6"
1313

1414
permissions: # added using https://github.com/step-security/secure-workflows
1515
contents: read
@@ -209,7 +209,7 @@ jobs:
209209
strategy:
210210
matrix:
211211
os: [ubuntu-22.04, actuated-arm64-4cpu-16gb, macos-12, windows-2019, windows-2022]
212-
go-version: ["1.20.12", "1.21.5"]
212+
go-version: ["1.20.13", "1.21.6"]
213213
steps:
214214
- uses: actions/setup-go@v5
215215
with:

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- uses: actions/setup-go@v5
3636
with:
37-
go-version: 1.21.5
37+
go-version: 1.21.6
3838

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

.github/workflows/images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/setup-go@v5
3030
with:
31-
go-version: "1.21.5"
31+
go-version: "1.21.6"
3232

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

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
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.21.5"
10+
GO_VERSION: "1.21.6"
1111

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

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
name: Release
1414

1515
env:
16-
GO_VERSION: "1.21.5"
16+
GO_VERSION: "1.21.6"
1717

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

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ EOF
104104
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
105105
sh.upload_path = "/tmp/vagrant-install-golang"
106106
sh.env = {
107-
'GO_VERSION': ENV['GO_VERSION'] || "1.21.5",
107+
'GO_VERSION': ENV['GO_VERSION'] || "1.21.6",
108108
}
109109
sh.inline = <<~SHELL
110110
#!/usr/bin/env bash

contrib/Dockerfile.test

Lines changed: 1 addition & 1 deletion
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.21.5
32+
ARG GOLANG_VERSION=1.21.6
3333
ARG GOLANG_IMAGE=golang
3434

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

contrib/fuzz/oss_fuzz_build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ go run main.go $SRC/containerd/images
4343

4444
apt-get update && apt-get install -y wget
4545
cd $SRC
46-
wget --quiet https://go.dev/dl/go1.21.5.linux-amd64.tar.gz
46+
wget --quiet https://go.dev/dl/go1.21.6.linux-amd64.tar.gz
4747

4848
mkdir temp-go
4949
rm -rf /root/.go/*
50-
tar -C temp-go/ -xzf go1.21.5.linux-amd64.tar.gz
50+
tar -C temp-go/ -xzf go1.21.6.linux-amd64.tar.gz
5151
mv temp-go/go/* /root/.go/
5252
cd $SRC/containerd
5353

script/setup/prepare_env_windows.ps1

Lines changed: 1 addition & 1 deletion
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.21.5"; make = ""; nssm = "" }
8+
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.6"; 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)