From 62d80156e1f73c52966a2172209fcdaae0b712b1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 2 Apr 2026 02:11:26 +0200 Subject: [PATCH 1/2] ci: pin remaining actions Signed-off-by: Sebastiaan van Stijn --- .github/workflows/validate.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 2aeede2edfc0..f12e1f0b8b62 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -89,14 +89,15 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: path: src/github.com/docker/cli - name: Set up Go - uses: actions/setup-go@v6 + uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6 with: go-version: "1.25.8" + cache: false - name: Run gocompat check shell: 'script --return --quiet --command "bash {0}"' From fb776458cb7f94c18f199c864331089634284a8d Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 27 Feb 2026 17:12:29 +0100 Subject: [PATCH 2/2] update to go1.26.1 Signed-off-by: Sebastiaan van Stijn --- .github/workflows/codeql.yml | 2 +- .github/workflows/test.yml | 2 +- .github/workflows/validate.yml | 2 +- .golangci.yml | 2 +- Dockerfile | 2 +- dockerfiles/Dockerfile.dev | 2 +- dockerfiles/Dockerfile.lint | 2 +- dockerfiles/Dockerfile.vendor | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e9155fe2062b..d97cb50513d8 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -63,7 +63,7 @@ jobs: name: Update Go uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6 with: - go-version: "1.25.8" + go-version: "1.26.1" cache: false - name: Initialize CodeQL diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3f8de89e669..177f4639bcfa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -67,7 +67,7 @@ jobs: name: Set up Go uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6 with: - go-version: "1.25.8" + go-version: "1.26.1" cache: false - name: Test diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index f12e1f0b8b62..1565990388b9 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -96,7 +96,7 @@ jobs: name: Set up Go uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6 with: - go-version: "1.25.8" + go-version: "1.26.1" cache: false - name: Run gocompat check diff --git a/.golangci.yml b/.golangci.yml index 057148b3bbb7..1b51208c1bce 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,7 +5,7 @@ run: # which causes it to fallback to go1.17 semantics. # # TODO(thaJeztah): update "usetesting" settings to enable go1.24 features once our minimum version is go1.24 - go: "1.25.8" + go: "1.26.1" timeout: 5m diff --git a/Dockerfile b/Dockerfile index 45a582c23c68..8e49eca45f26 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG BASE_VARIANT=alpine ARG ALPINE_VERSION=3.23 ARG BASE_DEBIAN_DISTRO=bookworm -ARG GO_VERSION=1.25.8 +ARG GO_VERSION=1.26.1 # XX_VERSION specifies the version of the xx utility to use. # It must be a valid tag in the docker.io/tonistiigi/xx image repository. diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev index 4493c22138e7..19822bd2da52 100644 --- a/dockerfiles/Dockerfile.dev +++ b/dockerfiles/Dockerfile.dev @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.25.8 +ARG GO_VERSION=1.26.1 # ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image. # It must be a supported tag in the docker.io/library/alpine image repository diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint index 24da2e13ba7f..478ecf8f171c 100644 --- a/dockerfiles/Dockerfile.lint +++ b/dockerfiles/Dockerfile.lint @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.25.8 +ARG GO_VERSION=1.26.1 # ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image. # It must be a supported tag in the docker.io/library/alpine image repository diff --git a/dockerfiles/Dockerfile.vendor b/dockerfiles/Dockerfile.vendor index ed3ab0de93c8..50fb3b59a59e 100644 --- a/dockerfiles/Dockerfile.vendor +++ b/dockerfiles/Dockerfile.vendor @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.25.8 +ARG GO_VERSION=1.26.1 # ALPINE_VERSION sets the version of the alpine base image to use, including for the golang image. # It must be a supported tag in the docker.io/library/alpine image repository