Skip to content

Commit

Permalink
feat: Bump Golang to 1.23.3
Browse files Browse the repository at this point in the history
Signed-off-by: Cezar Craciunoiu <[email protected]>
  • Loading branch information
craciunoiuc committed Nov 26, 2024
1 parent 6996da8 commit e2e93f3
Show file tree
Hide file tree
Showing 20 changed files with 31 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-static.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-stable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tools-go-generate-qemu-device.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tools-protoc-gen-go-netconn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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),)
Expand Down
8 changes: 4 additions & 4 deletions buildenvs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion buildenvs/base-golang.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion buildenvs/github-action.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions buildenvs/myself.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion tools/dockerfile-llb-frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 . ./
Expand Down
2 changes: 1 addition & 1 deletion tools/dockerfile-llb-frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/dockerfile-llb-frontend/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/github-action/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 1 addition & 3 deletions tools/go-generate-qemu-devices/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/protoc-gen-go-netconn/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/webinstall/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/webinstall/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit e2e93f3

Please sign in to comment.