From bf85e15dced64e6148e808f08eedb31eeeef527c Mon Sep 17 00:00:00 2001 From: Victor Castell Date: Tue, 19 Apr 2022 10:40:22 +0200 Subject: [PATCH] Bump Go version to v1.18 (#368) * Bump Go version to v1.18.1 --- Dockerfile.alltools | 2 +- Dockerfile.classic | 2 +- Makefile | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile.alltools b/Dockerfile.alltools index b702d332b922..a3f36d4a04cf 100644 --- a/Dockerfile.alltools +++ b/Dockerfile.alltools @@ -1,5 +1,5 @@ # Build Geth in a stock Go builder container -FROM golang:1.18-alpine as builder +FROM golang:1.18.1-alpine as builder RUN apk add --no-cache make gcc musl-dev linux-headers git diff --git a/Dockerfile.classic b/Dockerfile.classic index a60c55e7d450..2fa38f08f9ec 100644 --- a/Dockerfile.classic +++ b/Dockerfile.classic @@ -1,5 +1,5 @@ # Build Geth in a stock Go builder container -FROM golang:1.17-alpine as builder +FROM golang:1.18.1-alpine as builder RUN apk add --no-cache make gcc musl-dev linux-headers git bash diff --git a/Makefile b/Makefile index b4fc8de630f0..6469b8510f0c 100644 --- a/Makefile +++ b/Makefile @@ -160,7 +160,7 @@ geth-windows-amd64: @ls -ld $(GOBIN)/geth-windows-* | grep amd64 PACKAGE_NAME := github.com/maticnetwork/bor -GOLANG_CROSS_VERSION ?= v1.17.2 +GOLANG_CROSS_VERSION ?= v1.18.1 .PHONY: release-dry-run release-dry-run: @@ -174,7 +174,7 @@ release-dry-run: -v /var/run/docker.sock:/var/run/docker.sock \ -v `pwd`:/go/src/$(PACKAGE_NAME) \ -w /go/src/$(PACKAGE_NAME) \ - ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \ + goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \ --rm-dist --skip-validate --skip-publish .PHONY: release @@ -190,5 +190,5 @@ release: -v /var/run/docker.sock:/var/run/docker.sock \ -v `pwd`:/go/src/$(PACKAGE_NAME) \ -w /go/src/$(PACKAGE_NAME) \ - ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \ + goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \ --rm-dist --skip-validate