From 69414344ae04b88b355263b98bddbcfb57f35f9f Mon Sep 17 00:00:00 2001 From: Ben Gray Date: Tue, 21 Dec 2021 14:42:54 -0800 Subject: [PATCH 1/5] Fix golang version and remove unsupported archs --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e5aa532..20029b4 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ GOTAGS ?= GOMAXPROCS ?= 4 # Get the project metadata -GOVERSION := 1.8.1 +GOVERSION := 1.16.8 PROJECT := $(CURRENT_DIR:$(GOPATH)/src/%=%) OWNER := $(notdir $(patsubst %/,%,$(dir $(PROJECT)))) NAME := $(notdir $(PROJECT)) @@ -30,8 +30,8 @@ GOARCH ?= $(shell go env GOARCH) # Default os-arch combination to build XC_OS ?= darwin freebsd linux netbsd openbsd solaris windows -XC_ARCH ?= 386 amd64 arm -XC_EXCLUDE ?= darwin/arm solaris/386 solaris/arm windows/arm +XC_ARCH ?= amd64 arm arm64 +XC_EXCLUDE ?= darwin/arm solaris/arm windows/arm # GPG Signing key (blank by default, means no GPG signing) GPG_KEY ?= @@ -64,7 +64,7 @@ define make-xc-target --dns="8.8.8.8" \ --volume="${CURRENT_DIR}:/go/src/${PROJECT}" \ --workdir="/go/src/${PROJECT}" \ - "golang:1.8" \ + "golang:1.16" \ env \ CGO_ENABLED="0" \ GOOS="${1}" \ From 05617f9df5dff4352fa6d24595af8fd531af91ea Mon Sep 17 00:00:00 2001 From: Ben Gray Date: Tue, 21 Dec 2021 15:25:05 -0800 Subject: [PATCH 2/5] Exclude archs that don't build and fix Dockerfiles --- Makefile | 2 +- docker/alpine/Dockerfile | 2 +- docker/scratch/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 20029b4..4825ea8 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ GOARCH ?= $(shell go env GOARCH) # Default os-arch combination to build XC_OS ?= darwin freebsd linux netbsd openbsd solaris windows XC_ARCH ?= amd64 arm arm64 -XC_EXCLUDE ?= darwin/arm solaris/arm windows/arm +XC_EXCLUDE ?= darwin/arm solaris/arm solaris/arm64 windows/arm windows/arm64 # GPG Signing key (blank by default, means no GPG signing) GPG_KEY ?= diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 1a47191..9462c7d 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -1,7 +1,7 @@ # # Builder # -FROM golang:1.8 AS builder +FROM golang:1.16 AS builder LABEL maintainer "Seth Vargo (@sethvargo)" ARG LD_FLAGS diff --git a/docker/scratch/Dockerfile b/docker/scratch/Dockerfile index 6ba7271..25e1534 100644 --- a/docker/scratch/Dockerfile +++ b/docker/scratch/Dockerfile @@ -1,7 +1,7 @@ # # Builder # -FROM golang:1.8 AS builder +FROM golang:1.16 AS builder LABEL maintainer "Seth Vargo (@sethvargo)" ARG LD_FLAGS From 7018f00f506fc3a3775cfe98b8f31db63a8d1b9a Mon Sep 17 00:00:00 2001 From: Ben Gray Date: Wed, 15 Nov 2023 12:23:07 -0800 Subject: [PATCH 3/5] Update Makefile Re-adding 386 to avoid breaking change --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4825ea8..471937a 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ GOTAGS ?= GOMAXPROCS ?= 4 # Get the project metadata -GOVERSION := 1.16.8 +GOVERSION := 1.20 PROJECT := $(CURRENT_DIR:$(GOPATH)/src/%=%) OWNER := $(notdir $(patsubst %/,%,$(dir $(PROJECT)))) NAME := $(notdir $(PROJECT)) @@ -30,8 +30,8 @@ GOARCH ?= $(shell go env GOARCH) # Default os-arch combination to build XC_OS ?= darwin freebsd linux netbsd openbsd solaris windows -XC_ARCH ?= amd64 arm arm64 -XC_EXCLUDE ?= darwin/arm solaris/arm solaris/arm64 windows/arm windows/arm64 +XC_ARCH ?= 386 amd64 arm arm64 +XC_EXCLUDE ?= darwin/arm solaris/386 solaris/arm solaris/arm64 windows/arm windows/arm64 # GPG Signing key (blank by default, means no GPG signing) GPG_KEY ?= @@ -64,7 +64,7 @@ define make-xc-target --dns="8.8.8.8" \ --volume="${CURRENT_DIR}:/go/src/${PROJECT}" \ --workdir="/go/src/${PROJECT}" \ - "golang:1.16" \ + "golang:1.20" \ env \ CGO_ENABLED="0" \ GOOS="${1}" \ From d113af3daef44c1337cbf069edf9b2b46e3c344b Mon Sep 17 00:00:00 2001 From: Ben Gray Date: Wed, 15 Nov 2023 12:23:57 -0800 Subject: [PATCH 4/5] Update Dockerfile Update Alpine image to 1.20 --- docker/alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index dd710f8..4a9cb06 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -4,7 +4,7 @@ # # Builder # -FROM golang:1.16 AS builder +FROM golang:1.20 AS builder LABEL maintainer "Seth Vargo (@sethvargo)" ARG LD_FLAGS From ebc4619ae2ba56e39e86add7ab5c7865b5100fea Mon Sep 17 00:00:00 2001 From: Ben Gray Date: Wed, 15 Nov 2023 12:24:14 -0800 Subject: [PATCH 5/5] Update Dockerfile Update scratch image to 1.20 --- docker/scratch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/scratch/Dockerfile b/docker/scratch/Dockerfile index a786c22..a3e0559 100644 --- a/docker/scratch/Dockerfile +++ b/docker/scratch/Dockerfile @@ -4,7 +4,7 @@ # # Builder # -FROM golang:1.16 AS builder +FROM golang:1.20 AS builder LABEL maintainer "Seth Vargo (@sethvargo)" ARG LD_FLAGS