Go 1.21.0

https://go.dev/doc/go1.21

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2023-08-11 23:16:54 +09:00
parent 5756cb00e7
commit eacd74c2b0
No known key found for this signature in database
GPG Key ID: 49524C6F9F638F1A
14 changed files with 16 additions and 18 deletions

View File

@ -12,7 +12,7 @@
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/go:1": {
"version": "1.20"
"version": "1.21"
}
},

View File

@ -43,7 +43,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: "1.20.7"
go-version: "1.21.0"
- uses: actions/checkout@v3
with:

View File

@ -9,7 +9,7 @@ on:
env:
# Go version we currently use to build containerd across all CI.
# Note: don't forget to update `Binaries` step, as it contains the matrix of all supported Go versions.
GO_VERSION: "1.20.7"
GO_VERSION: "1.21.0"
permissions: # added using https://github.com/step-security/secure-workflows
contents: read
@ -209,7 +209,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04, macos-12, windows-2019, windows-2022]
go-version: ["1.20.7", "1.19.12"]
go-version: ["1.20.7", "1.21.0"]
steps:
- uses: actions/setup-go@v4
with:

View File

@ -34,7 +34,7 @@ jobs:
- uses: actions/setup-go@v3
with:
go-version: 1.20.7
go-version: 1.21.0
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL

View File

@ -58,8 +58,6 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
# FIXME: go-fuzz fails with Go 1.20: `cgo_unix_cgo_res.cgo2.c:(.text+0x32): undefined reference to `__res_search'`
# https://github.com/containerd/containerd/pull/8103#issuecomment-1429256152
go-version: 1.18
go-version: 1.21.x
- uses: actions/checkout@v3
- run: script/go-test-fuzz.sh

View File

@ -28,7 +28,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: "1.20.7"
go-version: "1.21.0"
- uses: actions/checkout@v3
with:

View File

@ -7,7 +7,7 @@ on:
- ".github/workflows/nightly.yml"
env:
GO_VERSION: "1.20.7"
GO_VERSION: "1.21.0"
permissions: # added using https://github.com/step-security/secure-workflows
contents: read

View File

@ -13,7 +13,7 @@ on:
name: Release
env:
GO_VERSION: "1.20.7"
GO_VERSION: "1.21.0"
permissions: # added using https://github.com/step-security/secure-workflows
contents: read

View File

@ -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.19.x or above
* Go 1.20.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.

2
Vagrantfile vendored
View File

@ -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.20.7",
'GO_VERSION': ENV['GO_VERSION'] || "1.21.0",
}
sh.inline = <<~SHELL
#!/usr/bin/env bash

View File

@ -29,7 +29,7 @@
# docker run --privileged containerd-test
# ------------------------------------------------------------------------------
ARG GOLANG_VERSION=1.20.7
ARG GOLANG_VERSION=1.21.0
ARG GOLANG_IMAGE=golang
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

View File

@ -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.19.5.linux-amd64.tar.gz
wget --quiet https://go.dev/dl/go1.21.0.linux-amd64.tar.gz
mkdir temp-go
rm -rf /root/.go/*
tar -C temp-go/ -xzf go1.19.5.linux-amd64.tar.gz
tar -C temp-go/ -xzf go1.21.0.linux-amd64.tar.gz
mv temp-go/go/* /root/.go/
cd $SRC/containerd

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/containerd/containerd
go 1.19
go 1.20
require (
dario.cat/mergo v1.0.0

View File

@ -5,7 +5,7 @@
# lived test environment.
Set-MpPreference -DisableRealtimeMonitoring:$true
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.20.7"; make = ""; nssm = "" }
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.21.0"; make = ""; nssm = "" }
Write-Host "Downloading chocolatey package"
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'