Skip to content

Commit 3b263d0

Browse files
akhilermakhilerm
committed
add go1.23.0, drop go1.21.x
- switch release and build jobs to 1.22.6 from 1.21.13 - add go1.23.0 to CI matrix - drop go1.21 from CI Signed-off-by: Akhil Mohan <[email protected]>
1 parent ac7da2e commit 3b263d0

11 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎.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.21.13"
6+
default: "1.22.6"
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.21.13"
9+
GO_VERSION: "1.22.6"
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, actuated-arm64-4cpu-16gb, macos-12, windows-2019, windows-2022]
195-
go-version: ["1.21.13", "1.22.6"]
195+
go-version: ["1.22.6", "1.23.0"]
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.21.13"
16+
GO_VERSION: "1.22.6"
1717

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

‎BUILDING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This doc includes:
1515
To build the `containerd` daemon, and the `ctr` simple test client, the following build system dependencies are required:
1616

1717

18-
* Go 1.21.x or above
18+
* Go 1.22.x or above
1919
* Protoc 3.x compiler and headers (download at the [Google protobuf releases page](https://github.com/protocolbuffers/protobuf/releases))
2020
* Btrfs headers and libraries for your distribution. Note that building the btrfs driver can be disabled via the build tag `no_btrfs`, removing this dependency.
2121

‎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.13",
107+
'GO_VERSION': ENV['GO_VERSION'] || "1.22.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.13
32+
ARG GOLANG_VERSION=1.22.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 --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.21.13.linux-amd64.tar.gz
46+
wget --quiet https://go.dev/dl/go1.22.6.linux-amd64.tar.gz
4747

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

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/containerd/containerd
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
dario.cat/mergo v1.0.0

‎integration/client/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/containerd/containerd/integration/client
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24

0 commit comments

Comments
 (0)