Skip to content

Commit afa254a

Browse files
committed
CI: test with go 1.25
Signed-off-by: Kohei Tokunaga <[email protected]>
1 parent 469e3af commit afa254a

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
steps:
9393
- uses: actions/setup-go@v6
9494
with:
95-
go-version: '1.24.x'
95+
go-version: '1.25.x'
9696
- name: Install k3d
9797
run: |
9898
wget -q -O - https://raw.githubusercontent.com/rancher/k3d/v5.6.3/install.sh | bash

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
fetch-depth: '0'
3939
- uses: actions/setup-go@v6
4040
with:
41-
go-version: '1.24.x'
41+
go-version: '1.25.x'
4242
- name: golangci-lint
4343
uses: golangci/[email protected]
4444
with:
@@ -241,7 +241,7 @@ jobs:
241241
steps:
242242
- uses: actions/setup-go@v6
243243
with:
244-
go-version: '1.24.x'
244+
go-version: '1.25.x'
245245
- name: Install k3d
246246
run: |
247247
wget -q -O - https://raw.githubusercontent.com/rancher/k3d/v5.6.3/install.sh | bash
@@ -271,7 +271,7 @@ jobs:
271271
steps:
272272
- uses: actions/setup-go@v6
273273
with:
274-
go-version: '1.24.x'
274+
go-version: '1.25.x'
275275
- name: Install k3d
276276
run: |
277277
wget -q -O - https://raw.githubusercontent.com/rancher/k3d/v5.6.3/install.sh | bash
@@ -316,7 +316,7 @@ jobs:
316316
steps:
317317
- uses: actions/setup-go@v6
318318
with:
319-
go-version: '1.24.x'
319+
go-version: '1.25.x'
320320
- uses: actions/checkout@v5
321321
with:
322322
path: src/github.com/containerd/stargz-snapshotter

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ ARG CRI_TOOLS_VERSION=v1.30.1
3434
# Legacy builder that doesn't support TARGETARCH should set this explicitly using --build-arg.
3535
# If TARGETARCH isn't supported by the builder, the default value is "amd64".
3636

37-
FROM golang:1.24-bullseye AS golang-base
37+
FROM golang:1.25-trixie AS golang-base
3838

3939
# Build containerd
40-
FROM --platform=$BUILDPLATFORM golang:1.24-bullseye AS containerd-dev
40+
FROM --platform=$BUILDPLATFORM golang:1.25-trixie AS containerd-dev
4141
ARG CONTAINERD_VERSION
4242
ARG TARGETARCH
4343
RUN git clone -b ${CONTAINERD_VERSION} --depth 1 \
@@ -46,7 +46,7 @@ RUN git clone -b ${CONTAINERD_VERSION} --depth 1 \
4646
GOARCH=$TARGETARCH make && DESTDIR=/out/ PREFIX= make install
4747

4848
# Build containerd with builtin stargz snapshotter
49-
FROM --platform=$BUILDPLATFORM golang:1.24-bullseye AS containerd-snapshotter-dev
49+
FROM --platform=$BUILDPLATFORM golang:1.25-trixie AS containerd-snapshotter-dev
5050
ARG CONTAINERD_VERSION
5151
ARG TARGETARCH
5252
COPY . $GOPATH/src/github.com/containerd/stargz-snapshotter
@@ -69,7 +69,7 @@ RUN git clone -b ${CONTAINERD_VERSION} --depth 1 \
6969
make vendor && GOARCH=$TARGETARCH make && DESTDIR=/out/ PREFIX= make install
7070

7171
# Build runc
72-
FROM golang:1.24-bullseye AS runc-dev
72+
FROM golang:1.25-trixie AS runc-dev
7373
ARG RUNC_VERSION
7474
RUN apt-get update -y && apt-get install -y libseccomp-dev && \
7575
git clone -b ${RUNC_VERSION} --depth 1 \
@@ -78,7 +78,7 @@ RUN apt-get update -y && apt-get install -y libseccomp-dev && \
7878
make && make install PREFIX=/out/
7979

8080
# Build stargz snapshotter
81-
FROM --platform=$BUILDPLATFORM golang:1.24-bullseye AS snapshotter-dev
81+
FROM --platform=$BUILDPLATFORM golang:1.25-trixie AS snapshotter-dev
8282
ARG TARGETARCH
8383
ARG GOARM
8484
ARG SNAPSHOTTER_BUILD_FLAGS
@@ -112,7 +112,7 @@ RUN apt-get update -y && apt-get install -y libseccomp-dev libgpgme-dev && \
112112

113113
# Build CRI-O
114114
# FROM golang-base AS cri-o-dev
115-
FROM golang:1.24-bullseye AS cri-o-dev
115+
FROM golang:1.25-trixie AS cri-o-dev
116116
ARG CRIO_VERSION
117117
RUN apt-get update -y && apt-get install -y libseccomp-dev libgpgme-dev && \
118118
git clone https://github.com/cri-o/cri-o $GOPATH/src/github.com/cri-o/cri-o && \

script/cri-containerd/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ ENV PATH=$PATH:/usr/local/go/bin
153153
ENV GOPATH=/go
154154
# Do not install git and its dependencies here which will cause failure of building the image
155155
RUN apt-get update && apt-get install -y --no-install-recommends make && \
156-
curl -Ls https://dl.google.com/go/go1.24.0.linux-\${TARGETARCH:-amd64}.tar.gz | tar -C /usr/local -xz && \
156+
curl -Ls https://dl.google.com/go/go1.25.3.linux-\${TARGETARCH:-amd64}.tar.gz | tar -C /usr/local -xz && \
157157
go install github.com/onsi/ginkgo/ginkgo@${GINKGO_VERSION} && \
158158
mkdir -p \${GOPATH}/src/github.com/kubernetes-sigs/cri-tools /tmp/cri-tools && \
159159
curl -sL https://github.com/kubernetes-sigs/cri-tools/archive/refs/tags/v${CRI_TOOLS_VERSION}.tar.gz | tar -C /tmp/cri-tools -xz && \

script/cri-o/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ENV PATH=$PATH:/usr/local/go/bin
6666
ENV GOPATH=/go
6767
# Do not install git and its dependencies here which will cause failure of building the image
6868
RUN apt-get update && apt-get install -y --no-install-recommends make && \
69-
curl -Ls https://dl.google.com/go/go1.24.0.linux-\${TARGETARCH:-amd64}.tar.gz | tar -C /usr/local -xz && \
69+
curl -Ls https://dl.google.com/go/go1.25.3.linux-\${TARGETARCH:-amd64}.tar.gz | tar -C /usr/local -xz && \
7070
go install github.com/onsi/ginkgo/ginkgo@${GINKGO_VERSION} && \
7171
mkdir -p \${GOPATH}/src/github.com/kubernetes-sigs/cri-tools /tmp/cri-tools && \
7272
curl -sL https://github.com/kubernetes-sigs/cri-tools/archive/refs/tags/v${CRI_TOOLS_VERSION}.tar.gz | tar -C /tmp/cri-tools -xz && \

script/integration/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ cat <<EOF > "${TMP_CONTEXT}/Dockerfile"
101101
FROM ${INTEGRATION_BASE_IMAGE_NAME}
102102
103103
RUN apt-get update -y && \
104-
apt-get --no-install-recommends install -y iptables jq netcat && \
104+
apt-get --no-install-recommends install -y iptables jq netcat-openbsd && \
105105
go install github.com/google/crfs/stargz/stargzify@71d77da419c90be7b05d12e59945ac7a8c94a543 && \
106106
wget https://dist.ipfs.io/go-ipfs/${IPFS_VERSION}/go-ipfs_${IPFS_VERSION}_linux-amd64.tar.gz && \
107107
tar -xvzf go-ipfs_${IPFS_VERSION}_linux-amd64.tar.gz && \

0 commit comments

Comments
 (0)