From 83524cadebceeb1b99dd8a16e26ad59663bda40e Mon Sep 17 00:00:00 2001 From: Cezar Craciunoiu Date: Tue, 26 Nov 2024 18:28:42 +0200 Subject: [PATCH] deps: Bump Golang to 1.23.3 Signed-off-by: Cezar Craciunoiu --- .github/workflows/check-static.yaml | 2 +- .github/workflows/tests-stable.yaml | 6 +++--- .github/workflows/tests.yaml | 6 +++--- .github/workflows/tools-go-generate-qemu-device.yaml | 4 ++-- .github/workflows/tools-protoc-gen-go-netconn.yaml | 4 ++-- Makefile | 2 +- buildenvs/Makefile | 8 ++++---- buildenvs/base-golang.Dockerfile | 2 +- buildenvs/github-action.Dockerfile | 2 +- buildenvs/myself.Dockerfile | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- tools/dockerfile-llb-frontend/Dockerfile | 2 +- tools/dockerfile-llb-frontend/README.md | 2 +- tools/dockerfile-llb-frontend/go.mod | 2 +- tools/github-action/go.mod | 2 +- tools/go-generate-qemu-devices/go.mod | 4 +--- tools/protoc-gen-go-netconn/go.mod | 2 +- tools/webinstall/Dockerfile | 2 +- tools/webinstall/go.mod | 2 +- 20 files changed, 31 insertions(+), 33 deletions(-) diff --git a/.github/workflows/check-static.yaml b/.github/workflows/check-static.yaml index 16d775f3a..9059c86ea 100644 --- a/.github/workflows/check-static.yaml +++ b/.github/workflows/check-static.yaml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.3 + go-version: 1.23.3 cache: false - name: Set Go variables diff --git a/.github/workflows/tests-stable.yaml b/.github/workflows/tests-stable.yaml index 4e1ba48f9..c4161e582 100644 --- a/.github/workflows/tests-stable.yaml +++ b/.github/workflows/tests-stable.yaml @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.3 + go-version: 1.23.3 cache: false - name: Set Go variables @@ -90,7 +90,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.3 + go-version: 1.23.3 cache: false - name: Set Go variables @@ -141,7 +141,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.3 + go-version: 1.23.3 cache: false - name: Set Go variables diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 0cc8070db..aabded1b0 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -25,7 +25,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.3 + go-version: 1.23.3 cache: false - name: Set Go variables @@ -67,7 +67,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.3 + go-version: 1.23.3 cache: false - name: Set Go variables @@ -120,7 +120,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.3 + go-version: 1.23.3 cache: false - name: Set Go variables diff --git a/.github/workflows/tools-go-generate-qemu-device.yaml b/.github/workflows/tools-go-generate-qemu-device.yaml index 16efef9f6..fb508e2c9 100644 --- a/.github/workflows/tools-go-generate-qemu-device.yaml +++ b/.github/workflows/tools-go-generate-qemu-device.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.3 + go-version: 1.23.3 cache: false - name: Set go.mod variable @@ -48,7 +48,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.3 + go-version: 1.23.3 cache: false - name: Set Go variables diff --git a/.github/workflows/tools-protoc-gen-go-netconn.yaml b/.github/workflows/tools-protoc-gen-go-netconn.yaml index b985a7fb0..de7176682 100644 --- a/.github/workflows/tools-protoc-gen-go-netconn.yaml +++ b/.github/workflows/tools-protoc-gen-go-netconn.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.3 + go-version: 1.23.3 cache: false - name: Set go.mod variable @@ -48,7 +48,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.3 + go-version: 1.23.3 cache: false - name: Set Go variables diff --git a/Makefile b/Makefile index aaff89778..b145e2d66 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ TOOLS ?= github-action \ webinstall GOMOD ?= kraftkit.sh IMAGE_TAG ?= latest -GO_VERSION ?= 1.22 +GO_VERSION ?= 1.23 # Add a special version tag for pull requests ifneq ($(shell grep 'refs/pull' $(WORKDIR)/.git/FETCH_HEAD),) diff --git a/buildenvs/Makefile b/buildenvs/Makefile index 5d2497a3c..4758efa56 100644 --- a/buildenvs/Makefile +++ b/buildenvs/Makefile @@ -43,7 +43,7 @@ qemu: $(DOCKER_BUILD_EXTRA) $(WORKDIR) .PHONY: myself -myself: GO_VERSION ?= 1.22.3 +myself: GO_VERSION ?= 1.23.3 myself: ENVIRONMENT ?= myself myself: IMAGE ?= $(REGISTRY)/myself:$(IMAGE_TAG) myself: TARGET ?= kraftkit @@ -68,7 +68,7 @@ myself-full: .PHONY: base base: ENVIRONMENT ?= base -base: GO_VERSION ?= 1.22.3 +base: GO_VERSION ?= 1.23.3 base: IMAGE ?= $(REGISTRY)/base:$(IMAGE_TAG) base: KRAFTKIT_VERSION ?= latest base: QEMU_VERSION ?= 8.2.4 @@ -90,7 +90,7 @@ base: .PHONY: base-golang base-golang: ENVIRONMENT ?= base-golang -base-golang: GO_VERSION ?= 1.22.3 +base-golang: GO_VERSION ?= 1.23.3 base-golang: IMAGE ?= $(REGISTRY)/base-golang:$(IMAGE_TAG) base-golang: KRAFTKIT_VERSION ?= latest base-golang: QEMU_VERSION ?= 8.2.4 @@ -113,7 +113,7 @@ base-golang: .PHONY: github-action github-action: ENVIRONMENT ?= github-action -github-action: GO_VERSION ?= 1.22.3 +github-action: GO_VERSION ?= 1.23.3 github-action: IMAGE ?= $(REGISTRY)/github-action:$(IMAGE_TAG) github-action: KRAFTKIT_VERSION ?= latest ifeq ($(WITH_CACHE),y) diff --git a/buildenvs/base-golang.Dockerfile b/buildenvs/base-golang.Dockerfile index 5767ca687..0491db831 100644 --- a/buildenvs/base-golang.Dockerfile +++ b/buildenvs/base-golang.Dockerfile @@ -3,7 +3,7 @@ # Licensed under the BSD-3-Clause License (the "License"). # You may not use this file except in compliance with the License. ARG REGISTRY=kraftkit.sh -ARG GO_VERSION=1.22.3 +ARG GO_VERSION=1.23.3 FROM golang:${GO_VERSION}-bookworm AS golang FROM ${REGISTRY}/base:latest diff --git a/buildenvs/github-action.Dockerfile b/buildenvs/github-action.Dockerfile index 4af0b8f57..d63c97064 100644 --- a/buildenvs/github-action.Dockerfile +++ b/buildenvs/github-action.Dockerfile @@ -2,7 +2,7 @@ # Copyright (c) 2022, Unikraft GmbH and The KraftKit Authors. # Licensed under the BSD-3-Clause License (the "License"). # You may not use this file except in compliance with the License. -ARG GO_VERSION=1.22.3 +ARG GO_VERSION=1.23.3 ARG DEBIAN_VERSION=bookworm-20240513 ARG KRAFTKIT_VERSION=latest ARG QEMU_VERSION=8.2.4 diff --git a/buildenvs/myself.Dockerfile b/buildenvs/myself.Dockerfile index f68142e00..d4d0cbe5e 100644 --- a/buildenvs/myself.Dockerfile +++ b/buildenvs/myself.Dockerfile @@ -3,7 +3,7 @@ # Licensed under the BSD-3-Clause License (the "License"). # You may not use this file except in compliance with the License. -ARG GO_VERSION=1.22.3 +ARG GO_VERSION=1.23.3 FROM golang:${GO_VERSION}-bookworm AS kraftkit-full @@ -34,7 +34,7 @@ RUN set -xe; \ WORKDIR /go/src/kraftkit.sh -COPY --from=ghcr.io/goreleaser/goreleaser-cross:v1.22.3 /usr/bin/goreleaser /usr/bin/ +COPY --from=ghcr.io/goreleaser/goreleaser-cross:v1.23.3 /usr/bin/goreleaser /usr/bin/ ENV DOCKER= ENV GOROOT=/usr/local/go diff --git a/go.mod b/go.mod index 8bfda8fb7..fe2464401 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/MakeNowJust/heredoc v1.0.0 github.com/Masterminds/semver/v3 v3.3.1 github.com/acorn-io/baaah v0.0.0-20230522221318-afcc93619e30 - github.com/anchore/stereoscope v0.0.3 + github.com/anchore/stereoscope v0.0.9 github.com/briandowns/spinner v1.23.1 github.com/cavaliergopher/cpio v1.0.1 github.com/charmbracelet/bubbles v0.20.0 diff --git a/go.sum b/go.sum index e80e8854f..b186b6480 100644 --- a/go.sum +++ b/go.sum @@ -113,8 +113,8 @@ github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092 h1:aM1 github.com/anchore/go-struct-converter v0.0.0-20221118182256-c68fdcfa2092/go.mod h1:rYqSE9HbjzpHTI74vwPvae4ZVYZd1lue2ta6xHPdblA= github.com/anchore/go-testutils v0.0.0-20200925183923-d5f45b0d3c04 h1:VzprUTpc0vW0nnNKJfJieyH/TZ9UYAnTZs5/gHTdAe8= github.com/anchore/go-testutils v0.0.0-20200925183923-d5f45b0d3c04/go.mod h1:6dK64g27Qi1qGQZ67gFmBFvEHScy0/C8qhQhNe5B5pQ= -github.com/anchore/stereoscope v0.0.3 h1:JRPHySy8S6P+Ff3IDiQ29ap1i8/laUQxDk9K1eFh/2U= -github.com/anchore/stereoscope v0.0.3/go.mod h1:5DJheGPjVRsSqegTB24Zi6SCHnYQnA519yeIG+RG+I4= +github.com/anchore/stereoscope v0.0.9 h1:rLhYWe/CXhDq/UCUWQ3U5xtpGk4RFnssKaM0bHhs5us= +github.com/anchore/stereoscope v0.0.9/go.mod h1:c2oGDU0R+llJObsatBSenjYPV1raKhMq9GEqe8J56EI= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= diff --git a/tools/dockerfile-llb-frontend/Dockerfile b/tools/dockerfile-llb-frontend/Dockerfile index 3ed3dfdd3..6f8ef3fa9 100644 --- a/tools/dockerfile-llb-frontend/Dockerfile +++ b/tools/dockerfile-llb-frontend/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the BSD-3-Clause License (the "License"). # You may not use this file except in compliance with the License. -FROM golang:1.22 AS builder +FROM golang:1.23 AS builder WORKDIR /src COPY . ./ diff --git a/tools/dockerfile-llb-frontend/README.md b/tools/dockerfile-llb-frontend/README.md index 2e39cde65..2a693652e 100644 --- a/tools/dockerfile-llb-frontend/README.md +++ b/tools/dockerfile-llb-frontend/README.md @@ -11,7 +11,7 @@ The result is a Unikraft image saved in your local Docker registry. ## Prerequisites - Docker with BuildKit enabled (this is the default setting from Docker v23.0 onwards) -- Go v1.22 or later +- Go v1.23 or later ## Usage diff --git a/tools/dockerfile-llb-frontend/go.mod b/tools/dockerfile-llb-frontend/go.mod index 25073e1c1..185a37842 100644 --- a/tools/dockerfile-llb-frontend/go.mod +++ b/tools/dockerfile-llb-frontend/go.mod @@ -1,6 +1,6 @@ module kraftkit.sh/tools/dockerfile-llb-frontend -go 1.22 +go 1.23.3 require ( github.com/moby/buildkit v0.12.5 diff --git a/tools/github-action/go.mod b/tools/github-action/go.mod index f2b9cc22c..e3799d92a 100644 --- a/tools/github-action/go.mod +++ b/tools/github-action/go.mod @@ -1,6 +1,6 @@ module kraftkit.sh/tools/github-action -go 1.22.0 +go 1.23.3 require ( github.com/mattn/go-shellwords v1.0.12 diff --git a/tools/go-generate-qemu-devices/go.mod b/tools/go-generate-qemu-devices/go.mod index 2aed56244..9cc45a25c 100644 --- a/tools/go-generate-qemu-devices/go.mod +++ b/tools/go-generate-qemu-devices/go.mod @@ -1,8 +1,6 @@ module kraftkit.sh/tools/go-generate-qemu-devices -go 1.22.0 - -toolchain go1.22.2 +go 1.23.3 require ( github.com/Masterminds/sprig/v3 v3.3.0 diff --git a/tools/protoc-gen-go-netconn/go.mod b/tools/protoc-gen-go-netconn/go.mod index 33e476042..99ceb607d 100644 --- a/tools/protoc-gen-go-netconn/go.mod +++ b/tools/protoc-gen-go-netconn/go.mod @@ -1,6 +1,6 @@ module kraftkit.sh/tools/protoc-gen-go-netconn -go 1.22 +go 1.23.3 require ( github.com/Masterminds/sprig/v3 v3.3.0 diff --git a/tools/webinstall/Dockerfile b/tools/webinstall/Dockerfile index a8420d7b1..a8ab34216 100644 --- a/tools/webinstall/Dockerfile +++ b/tools/webinstall/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the BSD-3-Clause License (the "License"). # You may not use this file expect in compliance with the License. -ARG GO_VERSION=1.22 +ARG GO_VERSION=1.23 FROM golang:${GO_VERSION}-bullseye AS base diff --git a/tools/webinstall/go.mod b/tools/webinstall/go.mod index 8babe4479..dec9cc18f 100644 --- a/tools/webinstall/go.mod +++ b/tools/webinstall/go.mod @@ -1,6 +1,6 @@ module github.com/unikraft/kraftkit/webinstall -go 1.22 +go 1.23.3 require ( github.com/rancher/wrangler v1.1.1