Merge pull request #1977 from weaveworks/release/1.12.1

Inline shell function to avoid CI incompatibility

Makefile

@@ -33,19 +33,14 @@ BUILD_DATE:=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
 all: $(GOPATH)/bin/fluxctl $(GOPATH)/bin/fluxd $(GOPATH)/bin/helm-operator build/.flux.done build/.helm-operator.done
 
 release-bins:
-	function do_build() { \
-		os=$$1 \
-		arch=$$2 \
-		CGO_ENABLED=0 GOOS=$$os GOARCH=$$arch go build -o "build/fluxctl_"$$os"_$$arch" $(LDFLAGS) -ldflags "-X main.version=$(shell ./docker/image-tag)" ./cmd/fluxctl/; \
-	};\
 	for arch in amd64; do \
 		for os in linux darwin windows; do \
-			do_build "$$os" "$$arch"; \
+			CGO_ENABLED=0 GOOS=$$os GOARCH=$$arch go build -o "build/fluxctl_"$$os"_$$arch" $(LDFLAGS) -ldflags "-X main.version=$(shell ./docker/image-tag)" ./cmd/fluxctl/; \
 		done; \
-	done; \
+	done;
 	for arch in arm arm64; do \
 		for os in linux; do \
-			do_build "$$os" "$$arch"; \
+			CGO_ENABLED=0 GOOS=$$os GOARCH=$$arch go build -o "build/fluxctl_"$$os"_$$arch" $(LDFLAGS) -ldflags "-X main.version=$(shell ./docker/image-tag)" ./cmd/fluxctl/; \
 		done; \
 	done;