Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go.mod: go 1.22 #10110

Merged
merged 3 commits into from Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/install-go/action.yml
Expand Up @@ -3,7 +3,7 @@ description: "Reusable action to install Go, so there is one place to bump Go ve
inputs:
go-version:
required: true
default: "1.21.9"
default: "1.22.2"
description: "Go version to install"

runs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -13,7 +13,7 @@ on:
name: Release

env:
GO_VERSION: "1.21.9"
GO_VERSION: "1.22.2"

permissions: # added using https://github.com/step-security/secure-workflows
contents: read
Expand Down
2 changes: 1 addition & 1 deletion BUILDING.md
Expand Up @@ -25,7 +25,7 @@ A codespace will open in a web-based version of Visual Studio Code. The [dev con

To build the `containerd` daemon, and the `ctr` simple test client, the following build system dependencies are required:

* Go 1.21.x or above
* Go 1.22.x or above
* Protoc 3.x compiler and headers (download at the [Google protobuf releases page](https://github.com/protocolbuffers/protobuf/releases))
* 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.

Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Expand Up @@ -104,7 +104,7 @@ EOF
config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
sh.upload_path = "/tmp/vagrant-install-golang"
sh.env = {
'GO_VERSION': ENV['GO_VERSION'] || "1.21.9",
'GO_VERSION': ENV['GO_VERSION'] || "1.22.2",
}
sh.inline = <<~SHELL
#!/usr/bin/env bash
Expand Down
2 changes: 1 addition & 1 deletion contrib/Dockerfile.test
Expand Up @@ -29,7 +29,7 @@
# docker run --privileged containerd-test
# ------------------------------------------------------------------------------

ARG GOLANG_VERSION=1.21.9
ARG GOLANG_VERSION=1.22.2
ARG GOLANG_IMAGE=golang

FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang
Expand Down
4 changes: 2 additions & 2 deletions contrib/fuzz/oss_fuzz_build.sh
Expand Up @@ -43,11 +43,11 @@ go run main.go $SRC/containerd/images

apt-get update && apt-get install -y wget
cd $SRC
wget --quiet https://go.dev/dl/go1.21.9.linux-amd64.tar.gz
wget --quiet https://go.dev/dl/go1.22.2.linux-amd64.tar.gz

mkdir temp-go
rm -rf /root/.go/*
tar -C temp-go/ -xzf go1.21.9.linux-amd64.tar.gz
tar -C temp-go/ -xzf go1.22.2.linux-amd64.tar.gz
mv temp-go/go/* /root/.go/
cd $SRC/containerd

Expand Down
2 changes: 1 addition & 1 deletion go.mod
@@ -1,6 +1,6 @@
module github.com/containerd/containerd/v2

go 1.21
go 1.22.0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Not sure whether this should be 1.22.2 or just 1.22.0)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we upgrade to 1.22.2, it will force anyone using containerd module to be upgraded to 1.22.2. I am good with keeping at 1.22.0


require (
dario.cat/mergo v1.0.0
Expand Down
11 changes: 9 additions & 2 deletions script/setup/install-runc
Expand Up @@ -34,11 +34,18 @@ function install_runc() {
: "${RUNC_REPO:=https://github.com/opencontainers/runc.git}"

TMPROOT=$(mktemp -d)
# runc is incompatible with Go 1.22 on glibc-based distros
# https://github.com/opencontainers/runc/issues/4233
GO121DIR="${TMPROOT}"/go121
mkdir -p "${GO121DIR}"
GOBIN="${GO121DIR}" go install golang.org/dl/go1.21.9@latest
GO121="${GO121DIR}"/go1.21.9
$GO121 download
git clone "${RUNC_REPO}" "${TMPROOT}"/runc
pushd "${TMPROOT}"/runc
git checkout "${RUNC_VERSION}"
make BUILDTAGS='seccomp' runc
$SUDO make install
make GO=$GO121 BUILDTAGS='seccomp' runc
$SUDO make GO=$GO121 install
popd
rm -fR "${TMPROOT}"
}
Expand Down
2 changes: 1 addition & 1 deletion script/setup/prepare_env_windows.ps1
Expand Up @@ -5,7 +5,7 @@
# lived test environment.
Set-MpPreference -DisableRealtimeMonitoring:$true

$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.9"; make = ""; nssm = "" }
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.22.2"; make = ""; nssm = "" }

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