From b97c83297eb82505501750a5bef805d39f33a262 Mon Sep 17 00:00:00 2001
From: Joel Speed <Joel.speed@hotmail.co.uk>
Date: Sat, 6 Feb 2021 23:19:33 +0000
Subject: [PATCH] Update release process to use makefile go version check
 (#1027)

Co-authored-by: Nick Meves <nick.meves@greenhouse.io>
---
 Makefile |  2 +-
 dist.sh  | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index af9c877d..717e36c0 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ test: lint
 	GO111MODULE=on $(GO) test $(TESTCOVER) -v -race ./...
 
 .PHONY: release
-release: lint test
+release: validate-go-version lint test
 	BINARY=${BINARY} VERSION=${VERSION} ./dist.sh
 
 .PHONY: validate-go-version
diff --git a/dist.sh b/dist.sh
index 9afca9c9..18e62fbe 100755
--- a/dist.sh
+++ b/dist.sh
@@ -7,13 +7,6 @@ if [[ -z ${BINARY} ]] || [[ -z ${VERSION} ]]; then
 	exit 1
 fi
 
-# Check for Go version 1.14.*
-GO_VERSION=$(go version | awk '{print $3}')
-if [[ ! "${GO_VERSION}" =~ ^go1.14.* ]]; then
-	echo "Go version must be >= go1.14"
-	exit 1
-fi
-
 ARCHS=(darwin-amd64 linux-amd64 linux-arm64 linux-armv6 freebsd-amd64 windows-amd64)
 
 mkdir -p release
@@ -28,10 +21,10 @@ for ARCH in "${ARCHS[@]}"; do
 	# Create architecture specific binaries
 	if [[ ${GO_ARCH} == "armv6" ]]; then
 		GO111MODULE=on GOOS=${GO_OS} GOARCH=arm GOARM=6 CGO_ENABLED=0 go build -ldflags="-X main.VERSION=${VERSION}" \
-			-o release/${BINARY}-${VERSION}.${ARCH}/${BINARY} github.com/oauth2-proxy/oauth2-proxy
+			-o release/${BINARY}-${VERSION}.${ARCH}/${BINARY} .
 	else
 		GO111MODULE=on GOOS=${GO_OS} GOARCH=${GO_ARCH} CGO_ENABLED=0 go build -ldflags="-X main.VERSION=${VERSION}" \
-			-o release/${BINARY}-${VERSION}.${ARCH}/${BINARY} github.com/oauth2-proxy/oauth2-proxy
+			-o release/${BINARY}-${VERSION}.${ARCH}/${BINARY} .
 	fi
 
 	cd release