8000 Merge pull request #11515 from akhilerm/1.7-updatego1.24.1 · containerd/containerd@576178b · GitHub
[go: up one dir, main page]
Skip to content

Commit 576178b

Browse files
estespestesp
authored
Merge pull request #11515 from akhilerm/1.7-updatego1.24.1
[release/1.7] update build to go1.23.7, test go1.24.1
2 parents 8946aa0 + a39863c commit 576178b

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
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.23.6"
6+
default: "1.23.7"
77
description: "Go version to install"
88

99
runs:

‎.github/workflows/api-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
name: API Release
77

88
env:
9-
GO_VERSION: "1.23.6"
9+
GO_VERSION: "1.23.7"
1010

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

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ jobs:
192192
strategy:
193193
matrix:
194194
os: [ubuntu-20.04, ubuntu-24.04-arm, macos-13, windows-2019, windows-2022]
195-
go-version: ["1.23.6", "1.24.0"]
195+
go-version: ["1.23.7", "1.24.1"]
196196
steps:
197197
- uses: actions/checkout@v4
198198
- uses: ./.github/actions/install-go

‎.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.23.6"
16+
GO_VERSION: "1.23.7"
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.23.6",
107+
'GO_VERSION': ENV['GO_VERSION'] || "1.23.7",
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.23.6
32+
ARG GOLANG_VERSION=1.23.7
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 --target_dir $SRC/containerd/images
4343

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

4848
mkdir temp-go
4949
rm -rf /root/.go/*
50-
tar -C temp-go/ -xzf go1.23.6.linux-amd64.tar.gz
50+
tar -C temp-go/ -xzf go1.23.7.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.23.6"; make = ""; nssm = "" }
8+
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.23.7"; 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)
0