b97c832 · typeable/oauth2-proxy

git.iko.soy/typeable/oauth2-proxy

on master help sign in

Update release process to use makefile go version check (#1027)

b97c832Joel Speed6 years ago

Makefile+1−1

@@ -82,7 +82,7 @@ test: lint

82 GO111MODULE=on $(GO) test $(TESTCOVER) -v -race ./...

84.PHONY: release

85−release: lint test

85+release: validate-go-version lint test

86 BINARY=${BINARY} VERSION=${VERSION} ./dist.sh

88.PHONY: validate-go-version

dist.sh+2−9

@@ -7,13 +7,6 @@ if [[ -z ${BINARY} ]] || [[ -z ${VERSION} ]]; then

7 exit 1

8fi

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−

17ARCHS=(darwin-amd64 linux-amd64 linux-arm64 linux-armv6 freebsd-amd64 windows-amd64)

10ARCHS=(darwin-amd64 linux-amd64 linux-arm64 linux-armv6 freebsd-amd64 windows-amd64)

19mkdir -p release

12mkdir -p release

@@ -28,10 +21,10 @@ for ARCH in "${ARCHS[@]}"; do

28 # Create architecture specific binaries

21 # Create architecture specific binaries

29 if [[ ${GO_ARCH} == "armv6" ]]; then

22 if [[ ${GO_ARCH} == "armv6" ]]; then

30 GO111MODULE=on GOOS=${GO_OS} GOARCH=arm GOARM=6 CGO_ENABLED=0 go build -ldflags="-X main.VERSION=${VERSION}" \

23 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} .

32 else

25 else

33 GO111MODULE=on GOOS=${GO_OS} GOARCH=${GO_ARCH} CGO_ENABLED=0 go build -ldflags="-X main.VERSION=${VERSION}" \

26 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} .

35 fi

28 fi

37 cd release

30 cd release