Skip to content

Commit

Permalink
feat: Upgrade to Go 1.20.6 (#553)
Browse files Browse the repository at this point in the history
Approved-by: Antoine Cotten <[email protected]>
  • Loading branch information
antoineco authored Jul 24, 2023
2 parents 8f4c405 + 4304db9 commit 1f4cb63
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gobuild-protoc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.20.2
go-version: 1.20.6
cache: false

- name: Set go.mod variable
Expand All @@ -49,7 +49,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.20.2
go-version: 1.20.6
cache: false

- name: Set Go variables
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gobuild-qemu-devices.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.20.2
go-version: 1.20.6
cache: false

- name: Set go.mod variable
Expand All @@ -49,7 +49,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.20.2
go-version: 1.20.6
cache: false

- name: Set Go variables
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gochecks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.20.2
go-version: 1.20.6
cache: false

- name: Set Go variables
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gotests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: actions/setup-go@v4
with:
go-version: 1.20.2
go-version: 1.20.6
cache: false

- name: Set Go variables
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.20.2
go-version: 1.20.6
cache: false

- name: Set Go variables
Expand Down
4 changes: 2 additions & 2 deletions buildenvs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ gcc:
$(DOCKER_BUILD_EXTRA) $(WORKDIR)

.PHONY: myself
myself: GO_VERSION ?= 1.20.2
myself: GO_VERSION ?= 1.20.6
myself: ENVIRONMENT ?= myself
myself: IMAGE ?= $(REGISTRY)/myself:$(IMAGE_TAG)
myself: TARGET ?= kraftkit
Expand All @@ -90,7 +90,7 @@ myself-full:
base: ENVIRONMENT ?= base
base: GCC_PREFIX ?= x86_64-linux-gnu
base: GCC_VERSION ?= 12.2.0
base: GO_VERSION ?= 1.20.2
base: GO_VERSION ?= 1.20.6
base: IMAGE ?= $(REGISTRY)/base:$(IMAGE_TAG)
base: KRAFTKIT_VERSION ?= latest
base: QEMU_VERSION ?= 7.1.0
Expand Down
18 changes: 9 additions & 9 deletions buildenvs/myself.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
# 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.20.2
ARG GO_VERSION=1.20.6

FROM golang:${GO_VERSION}-bullseye AS kraftkit-full

# Install build dependencies
RUN set -xe; \
apt-get update; \
apt-get install -y --no-install-recommends \
build-essential=12.9 \
cmake=3.18.4-2+deb11u1 \
libssh2-1-dev=1.9.0-2 \
libssl-dev=1.1.1n-0+deb11u4 \
make=4.3-4.1 \
pkg-config=0.29.2-1 \
git=1:2.30.2-1+deb11u2; \
build-essential \
cmake \
libssh2-1-dev \
libssl-dev \
make \
pkg-config \
git; \
apt-get clean; \
go install mvdan.cc/[email protected]; \
git config --global --add safe.directory /go/src/kraftkit.sh;
Expand All @@ -31,7 +31,7 @@ RUN set -xe; \

WORKDIR /go/src/kraftkit.sh

COPY --from=ghcr.io/goreleaser/goreleaser-cross:v1.20.2 /usr/bin/goreleaser /usr/bin/
COPY --from=ghcr.io/goreleaser/goreleaser-cross:v1.20.6 /usr/bin/goreleaser /usr/bin/

ENV DOCKER=
ENV GOROOT=/usr/local/go
Expand Down

0 comments on commit 1f4cb63

Please sign in to comment.