git.iko.soy/typeable/oauth2-proxy
on master help sign in
Update release process to use makefile go version check (#1027)

Co-authored-by: Nick Meves <nick.meves@greenhouse.io>

commitb97c83297eb82505501750a5bef805d39f33a262 authorJoel Speed <Joel.speed@hotmail.co.uk> dateSat 6 Feb 2021, 23:19 (6 years ago) parentc9d9769
2 files changed+3−10
Makefile+1−1 dist.sh+2−9
Makefile+1−1
@@ -82,7 +82,7 @@ test: lint
8282 GO111MODULE=on $(GO) test $(TESTCOVER) -v -race ./...
8383
8484.PHONY: release
85−release: lint test
85+release: validate-go-version lint test
8686 BINARY=${BINARY} VERSION=${VERSION} ./dist.sh
8787
8888.PHONY: validate-go-version
dist.sh+2−9
@@ -7,13 +7,6 @@ if [[ -z ${BINARY} ]] || [[ -z ${VERSION} ]]; then
77 exit 1
88fi
99
10−# Check for Go version 1.14.*
11−GO_VERSION=$(go version | awk '{print $3}')
12−if [[ ! "${GO_VERSION}" =~ ^go1.14.* ]]; then
13− echo "Go version must be >= go1.14"
14− exit 1
15−fi
16−
1710ARCHS=(darwin-amd64 linux-amd64 linux-arm64 linux-armv6 freebsd-amd64 windows-amd64)
1811
1912mkdir -p release
@@ -28,10 +21,10 @@ for ARCH in "${ARCHS[@]}"; do
2821 # Create architecture specific binaries
2922 if [[ ${GO_ARCH} == "armv6" ]]; then
3023 GO111MODULE=on GOOS=${GO_OS} GOARCH=arm GOARM=6 CGO_ENABLED=0 go build -ldflags="-X main.VERSION=${VERSION}" \
31− -o release/${BINARY}-${VERSION}.${ARCH}/${BINARY} github.com/oauth2-proxy/oauth2-proxy
24+ -o release/${BINARY}-${VERSION}.${ARCH}/${BINARY} .
3225 else
3326 GO111MODULE=on GOOS=${GO_OS} GOARCH=${GO_ARCH} CGO_ENABLED=0 go build -ldflags="-X main.VERSION=${VERSION}" \
34− -o release/${BINARY}-${VERSION}.${ARCH}/${BINARY} github.com/oauth2-proxy/oauth2-proxy
27+ -o release/${BINARY}-${VERSION}.${ARCH}/${BINARY} .
3528 fi
3629
3730 cd release