Browse Source

Inline shell function to avoid CI incompatibility

CircleCI doesn't like the shell function defined in the Makefile;
inline the contents into the two call sites, so we don't have to worry
about that.
Michael Bridgen 4 weeks ago
parent
commit
734eba34f6
1 changed files with 3 additions and 8 deletions
  1. 3
    8
      Makefile

+ 3
- 8
Makefile View File

@@ -33,19 +33,14 @@ BUILD_DATE:=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
33 33
 all: $(GOPATH)/bin/fluxctl $(GOPATH)/bin/fluxd $(GOPATH)/bin/helm-operator build/.flux.done build/.helm-operator.done
34 34
 
35 35
 release-bins:
36
-	function do_build() { \
37
-		os=$$1 \
38
-		arch=$$2 \
39
-		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/; \
40
-	};\
41 36
 	for arch in amd64; do \
42 37
 		for os in linux darwin windows; do \
43
-			do_build "$$os" "$$arch"; \
38
+			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/; \
44 39
 		done; \
45
-	done; \
40
+	done;
46 41
 	for arch in arm arm64; do \
47 42
 		for os in linux; do \
48
-			do_build "$$os" "$$arch"; \
43
+			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/; \
49 44
 		done; \
50 45
 	done;
51 46
 

Loading…
Cancel
Save