From 84152b6cc262ef6790495e16a74c536ff37c7afe Mon Sep 17 00:00:00 2001 From: Kohei Tokunaga Date: Wed, 4 Sep 2024 10:55:17 +0900 Subject: [PATCH] CI: use go 1.23 Signed-off-by: Kohei Tokunaga --- .github/workflows/nightly.yml | 2 +- .github/workflows/tests.yml | 8 ++++---- Dockerfile | 6 +++--- script/cri-containerd/test.sh | 2 +- script/cri-o/test.sh | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4925c2862..71105b6b1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -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 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7f13f8d9e..c5048354a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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: @@ -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 @@ -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 @@ -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 diff --git a/Dockerfile b/Dockerfile index 29b5b54ff..719555924 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -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 \ @@ -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 && \ diff --git a/script/cri-containerd/test.sh b/script/cri-containerd/test.sh index ad781109e..10f12673c 100755 --- a/script/cri-containerd/test.sh +++ b/script/cri-containerd/test.sh @@ -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 && \ diff --git a/script/cri-o/test.sh b/script/cri-o/test.sh index 7360f5476..4b4c38c6c 100755 --- a/script/cri-o/test.sh +++ b/script/cri-o/test.sh @@ -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 && \