mirror of
https://github.com/containerd/containerd.git
synced 2026-11-06 05:17:02 +00:00
Merge pull request #12844 from akhilerm/go-1.26
ci: add build/test go1.26.0, drop go1.24
This commit is contained in:
9 files changed
+11
-14
No files matched your search
@@ -12,7 +12,7 @@
|
||||
"features": {
|
||||
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
|
||||
"ghcr.io/devcontainers/features/go:1": {
|
||||
"version": "1.24.13"
|
||||
"version": "1.25.7"
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@@ -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.24.13"
|
||||
default: "1.25.7"
|
||||
description: "Go version to install"
|
||||
|
||||
runs:
|
||||
|
||||
@@ -6,7 +6,7 @@ on:
|
||||
name: API Release
|
||||
|
||||
env:
|
||||
GO_VERSION: "1.24.13"
|
||||
GO_VERSION: "1.25.7"
|
||||
|
||||
permissions: # added using https://github.com/step-security/secure-workflows
|
||||
contents: read
|
||||
|
||||
@@ -33,7 +33,7 @@ jobs:
|
||||
- uses: ./.github/actions/install-go
|
||||
- uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
|
||||
with:
|
||||
version: v2.1.5
|
||||
version: v2.9.0
|
||||
skip-cache: true
|
||||
args: --timeout=8m
|
||||
|
||||
@@ -130,9 +130,6 @@ jobs:
|
||||
goarch: amd64
|
||||
- goos: freebsd
|
||||
goarch: arm64
|
||||
- goos: windows
|
||||
goarch: arm
|
||||
goarm: "7"
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
|
||||
@@ -187,7 +184,7 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest, windows-latest]
|
||||
go-version: ["1.24.13", "1.25.7"]
|
||||
go-version: ["1.25.7", "1.26.0"]
|
||||
exclude:
|
||||
- os: ${{ github.event.repository.private && 'ubuntu-24.04-arm' || '' }}
|
||||
steps:
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
ARG UBUNTU_VERSION=22.04
|
||||
ARG BASE_IMAGE=ubuntu:${UBUNTU_VERSION}
|
||||
ARG GO_VERSION=1.24.13
|
||||
ARG GO_VERSION=1.25.7
|
||||
ARG GO_IMAGE=golang:${GO_VERSION}
|
||||
FROM --platform=$BUILDPLATFORM $GO_IMAGE AS go
|
||||
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.6.1@sha256:923441d7c25f1e2eb5789f82d987693c47b8ed987c4ab3b075d6ed2b5d6779a3 AS xx
|
||||
|
||||
Vendored
+1
-1
@@ -107,7 +107,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.24.13",
|
||||
'GO_VERSION': ENV['GO_VERSION'] || "1.25.7",
|
||||
}
|
||||
sh.inline = <<~SHELL
|
||||
#!/usr/bin/env bash
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
# docker run --privileged --group-add keep-groups -v ./critest_exit_code.txt:/tmp/critest_exit_code.txt containerd-test
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
ARG GOLANG_VERSION=1.24.13
|
||||
ARG GOLANG_VERSION=1.25.7
|
||||
ARG GOLANG_IMAGE=golang
|
||||
|
||||
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang
|
||||
|
||||
@@ -39,11 +39,11 @@ compile_fuzzers() {
|
||||
|
||||
apt-get update && apt-get install -y wget
|
||||
cd $SRC
|
||||
wget --quiet https://go.dev/dl/go1.24.13.linux-amd64.tar.gz
|
||||
wget --quiet https://go.dev/dl/go1.25.7.linux-amd64.tar.gz
|
||||
|
||||
mkdir temp-go
|
||||
rm -rf /root/.go/*
|
||||
tar -C temp-go/ -xzf go1.24.13.linux-amd64.tar.gz
|
||||
tar -C temp-go/ -xzf go1.25.7.linux-amd64.tar.gz
|
||||
mv temp-go/go/* /root/.go/
|
||||
cd $SRC/containerd
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
# lived test environment.
|
||||
Set-MpPreference -DisableRealtimeMonitoring:$true
|
||||
|
||||
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.24.13"; make = ""; nssm = "" }
|
||||
$PACKAGES= @{ mingw = "10.2.0"; git = ""; golang = "1.25.7"; make = ""; nssm = "" }
|
||||
|
||||
Write-Host "Downloading chocolatey package"
|
||||
curl.exe -L "https://packages.chocolatey.org/chocolatey.0.10.15.nupkg" -o 'c:\choco.zip'
|
||||
|
||||
Reference in new issue
Block a user