Skip to content

Commit a76e482

Browse files
authored
Merge pull request containerd#10809 from austinvazquez/cherry-pick-46f5a0d9392f13f5f1402f314e6246e692e64428-to-1.6
[release/1.6 backport] update to go1.23.2,go1.22.8
2 parents 572a6c2 + 1ca261f commit a76e482

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

.github/actions/install-go/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "Reusable action to install Go, so there is one place to bump Go ve
33
inputs:
44
go-version:
55
required: true
6-
default: "1.22.7"
6+
default: "1.22.8"
77
description: "Go version to install"
88

99
runs:

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ jobs:
218218
strategy:
219219
matrix:
220220
os: [ubuntu-20.04, actuated-arm64-4cpu-16gb, macos-13, windows-2019, windows-2022]
221-
go-version: ["1.22.7", "1.23.1"]
221+
go-version: ["1.22.8", "1.23.2"]
222222
steps:
223223
- name: Install dependencies
224224
if: matrix.os == 'ubuntu-20.04' || matrix.os == 'actuated-arm64-4cpu-16gb'

.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: Containerd Release
1414

1515
env:
16-
GO_VERSION: "1.22.7"
16+
GO_VERSION: "1.22.8"
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
@@ -96,7 +96,7 @@ EOF
9696
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
9797
sh.upload_path = "/tmp/vagrant-install-golang"
9898
sh.env = {
99-
'GO_VERSION': ENV['GO_VERSION'] || "1.22.7",
99+
'GO_VERSION': ENV['GO_VERSION'] || "1.22.8",
100100
}
101101
sh.inline = <<~SHELL
102102
#!/usr/bin/env bash

contrib/Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../
1212

13-
ARG GOLANG_VERSION=1.22.7
13+
ARG GOLANG_VERSION=1.22.8
1414
ARG GOLANG_IMAGE=golang
1515

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

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.22.7"; make = ""; nssm = "" }
8+
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.22.8"; 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)