Skip to content

Commit

Permalink
CI: use go 1.23
Browse files Browse the repository at this point in the history
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
  • Loading branch information
ktock committed Sep 4, 2024
1 parent dbebe60 commit 84152b6
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.23.x'
- name: Install k3d
run: |
wget -q -O - https://raw.githubusercontent.com/rancher/k3d/v5.6.3/install.sh | bash
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
fetch-depth: '0'
- uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.23.x'
- name: golangci-lint
uses: golangci/golangci-lint-action@v6.1.0
with:
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.23.x'
- name: Install k3d
run: |
wget -q -O - https://raw.githubusercontent.com/rancher/k3d/v5.6.3/install.sh | bash
Expand Down Expand Up @@ -233,7 +233,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.23.x'
- name: Install k3d
run: |
wget -q -O - https://raw.githubusercontent.com/rancher/k3d/v5.6.3/install.sh | bash
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '1.22.x'
go-version: '1.23.x'
- uses: actions/checkout@v4
with:
path: src/github.com/containerd/stargz-snapshotter
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ARG CRI_TOOLS_VERSION=v1.30.0
# Legacy builder that doesn't support TARGETARCH should set this explicitly using --build-arg.
# If TARGETARCH isn't supported by the builder, the default value is "amd64".

FROM golang:1.22.4-bullseye AS golang-base
FROM golang:1.23-bullseye AS golang-base

# Build containerd
FROM golang-base AS containerd-dev
Expand Down Expand Up @@ -79,7 +79,7 @@ RUN apt-get update -y && apt-get install -y libbtrfs-dev libseccomp-dev && \
make vendor && make && DESTDIR=/out/ PREFIX= make install

# Build runc
FROM golang:1.22-bullseye AS runc-dev
FROM golang:1.23-bullseye AS runc-dev
ARG RUNC_VERSION
RUN apt-get update -y && apt-get install -y libseccomp-dev && \
git clone -b ${RUNC_VERSION} --depth 1 \
Expand Down Expand Up @@ -121,7 +121,7 @@ RUN apt-get update -y && apt-get install -y libseccomp-dev libgpgme-dev && \

# Build CRI-O
# FROM golang-base AS cri-o-dev
FROM golang:1.22-bullseye AS cri-o-dev
FROM golang:1.23-bullseye AS cri-o-dev
ARG CRIO_VERSION
RUN apt-get update -y && apt-get install -y libseccomp-dev libgpgme-dev && \
git clone https://github.com/cri-o/cri-o $GOPATH/src/github.com/cri-o/cri-o && \
Expand Down
2 changes: 1 addition & 1 deletion script/cri-containerd/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ ENV PATH=$PATH:/usr/local/go/bin
ENV GOPATH=/go
# Do not install git and its dependencies here which will cause failure of building the image
RUN apt-get update && apt-get install -y --no-install-recommends make && \
curl -Ls https://dl.google.com/go/go1.22.3.linux-\${TARGETARCH:-amd64}.tar.gz | tar -C /usr/local -xz && \
curl -Ls https://dl.google.com/go/go1.23.0.linux-\${TARGETARCH:-amd64}.tar.gz | tar -C /usr/local -xz && \
go install github.com/onsi/ginkgo/ginkgo@${GINKGO_VERSION} && \
mkdir -p \${GOPATH}/src/github.com/kubernetes-sigs/cri-tools /tmp/cri-tools && \
curl -sL https://github.com/kubernetes-sigs/cri-tools/archive/refs/tags/v${CRI_TOOLS_VERSION}.tar.gz | tar -C /tmp/cri-tools -xz && \
Expand Down
2 changes: 1 addition & 1 deletion script/cri-o/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ ENV PATH=$PATH:/usr/local/go/bin
ENV GOPATH=/go
# Do not install git and its dependencies here which will cause failure of building the image
RUN apt-get update && apt-get install -y --no-install-recommends make && \
curl -Ls https://dl.google.com/go/go1.22.3.linux-\${TARGETARCH:-amd64}.tar.gz | tar -C /usr/local -xz && \
curl -Ls https://dl.google.com/go/go1.23.0.linux-\${TARGETARCH:-amd64}.tar.gz | tar -C /usr/local -xz && \
go install github.com/onsi/ginkgo/ginkgo@${GINKGO_VERSION} && \
mkdir -p \${GOPATH}/src/github.com/kubernetes-sigs/cri-tools /tmp/cri-tools && \
curl -sL https://github.com/kubernetes-sigs/cri-tools/archive/refs/tags/v${CRI_TOOLS_VERSION}.tar.gz | tar -C /tmp/cri-tools -xz && \
Expand Down

0 comments on commit 84152b6

Please sign in to comment.