Skip to content

[pull] main from containerd:main #244

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.

Sign up for GitHub

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

Merged
pull merged 10 commits into from
Feb 18, 2026
Merged

[pull] main from containerd:main #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9a0c5f1
ci: build/test go1.26.0
akhilerm Feb 1, 2026
e4320e6
remove windows/arm from cross build
akhilerm Feb 10, 2026
1f84d27
update golangci-lint to v2.9.0 with go1.26 support
akhilerm Feb 11, 2026
41f92ec
Remove sandbox Container field from metadata
mxpv Jan 30, 2026
8ccf187
Update sandbox API to include spec field
mxpv Jan 30, 2026
7474a0b
Fix fetching sandbox metadata
mxpv Jan 30, 2026
528a2ba
Add lifecycle workaround to NRI
mxpv Jan 31, 2026
58c5ab4
Update proto
mxpv Feb 7, 2026
97c4540
Merge pull request #12844 from akhilerm/go-1.26
mxpv Feb 18, 2026
ec5d378
Merge pull request #12840 from mxpv/sandbox
mxpv Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install-go/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
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.24.13"
default: "1.25.7"
description: "Go version to install"

runs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/api-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading