adds release build for macos darwin amd64 and arm64

#1896 #1851
VictoriaMetrics · Feb 14, 2022 · 266a094 · 266a094
1 parent 93c2db5
commit 266a094
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -100,7 +100,9 @@ release: \
 release-victoria-metrics: \
 	release-victoria-metrics-amd64 \
 	release-victoria-metrics-arm \
-	release-victoria-metrics-arm64
+	release-victoria-metrics-arm64 \
+	release-victoria-metrics-darwin-amd64 \
+	release-victoria-metrics-darwin-arm64
 
 release-victoria-metrics-amd64:
 	GOARCH=amd64 $(MAKE) release-victoria-metrics-generic
@@ -111,6 +113,12 @@ release-victoria-metrics-arm:
 release-victoria-metrics-arm64:
 	GOARCH=arm64 $(MAKE) release-victoria-metrics-generic
 
+release-victoria-metrics-darwin-amd64:
+	GOARCH=darwin-arm64 $(MAKE) release-victoria-metrics-generic
+
+release-victoria-metrics-darwin-arm64:
+	GOARCH=darwin-arm64 $(MAKE) release-victoria-metrics-generic
+
 release-victoria-metrics-generic: victoria-metrics-$(GOARCH)-prod
 	cd bin && \
 		tar --transform="flags=r;s|-$(GOARCH)||" -czf victoria-metrics-$(GOARCH)-$(PKG_TAG).tar.gz \
@@ -123,7 +131,9 @@ release-vmutils: \
 	release-vmutils-amd64 \
 	release-vmutils-arm64 \
 	release-vmutils-arm \
-	release-vmutils-windows-amd64
+	release-vmutils-windows-amd64 \
+	release-vmutils-darwin-amd64  \
+	release-vmutils-darwin-arm64
 
 release-vmutils-amd64:
 	GOARCH=amd64 $(MAKE) release-vmutils-generic
@@ -137,6 +147,12 @@ release-vmutils-arm:
 release-vmutils-windows-amd64:
 	GOARCH=amd64 $(MAKE) release-vmutils-windows-generic
 
+release-vmutils-darwin-amd64:
+	GOARCH=darwin-amd64 $(MAKE) release-vmutils-generic
+
+release-vmutils-darwin-arm64:
+	GOARCH=darwin-arm64 $(MAKE) release-vmutils-generic
+
 release-vmutils-generic: \
 	vmagent-$(GOARCH)-prod \
 	vmalert-$(GOARCH)-prod \

diff --git a/app/victoria-metrics/Makefile b/app/victoria-metrics/Makefile
@@ -76,6 +76,12 @@ victoria-metrics-386:
 victoria-metrics-pure:
 	APP_NAME=victoria-metrics $(MAKE) app-local-pure
 
+victoria-metrics-darwin-amd64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 APP_NAME=victoria-metrics $(MAKE) app-via-docker-goarch-goos
+
+victoria-metrics-darwin-arm64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 APP_NAME=victoria-metrics $(MAKE) app-via-docker-goarch-goos
+
 ### Packaging as DEB - amd64
 victoria-metrics-package-deb: victoria-metrics-prod
 	./package/package_deb.sh amd64

diff --git a/app/vmagent/Makefile b/app/vmagent/Makefile
@@ -84,3 +84,9 @@ vmagent-windows-amd64:
 
 vmagent-windows-amd64-prod:
 	APP_NAME=vmagent $(MAKE) app-via-docker-windows-amd64
+
+vmagent-darwin-amd64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 APP_NAME=vmagent $(MAKE) app-via-docker-goarch-goos
+
+vmagent-darwin-arm64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 APP_NAME=vmagent $(MAKE) app-via-docker-goarch-goos
diff --git a/app/vmalert/Makefile b/app/vmalert/Makefile
@@ -112,3 +112,9 @@ vmalert-windows-amd64:
 
 vmalert-windows-amd64-prod:
 	APP_NAME=vmalert $(MAKE) app-via-docker-windows-amd64
+
+vmalert-darwin-amd64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 APP_NAME=vmalert $(MAKE) app-via-docker-goarch-goos
+
+vmalert-darwin-arm64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 APP_NAME=vmalert $(MAKE) app-via-docker-goarch-goos
diff --git a/app/vmauth/Makefile b/app/vmauth/Makefile
@@ -83,3 +83,9 @@ vmauth-windows-amd64:
 
 vmauth-windows-amd64-prod:
 	APP_NAME=vmauth $(MAKE) app-via-docker-windows-amd64
+
+vmauth-darwin-amd64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 APP_NAME=vmauth $(MAKE) app-via-docker-goarch-goos
+
+vmauth-darwin-arm64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 APP_NAME=vmauth $(MAKE) app-via-docker-goarch-goos
diff --git a/app/vmbackup/Makefile b/app/vmbackup/Makefile
@@ -71,3 +71,9 @@ vmbackup-local-with-goarch:
 
 vmbackup-pure:
 	APP_NAME=vmbackup $(MAKE) app-local-pure
+
+vmbackup-darwin-amd64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 APP_NAME=vmbackup $(MAKE) app-via-docker-goarch-goos
+
+vmbackup-darwin-arm64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 APP_NAME=vmbackup $(MAKE) app-via-docker-goarch-goos
diff --git a/app/vmctl/Makefile b/app/vmctl/Makefile
@@ -77,3 +77,9 @@ vmctl-windows-amd64:
 
 vmctl-windows-amd64-prod:
 	APP_NAME=vmctl $(MAKE) app-via-docker-windows-amd64
+
+vmctl-darwin-amd64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 APP_NAME=vmctl $(MAKE) app-via-docker-goarch-goos
+
+vmctl-darwin-arm64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 APP_NAME=vmctl $(MAKE) app-via-docker-goarch-goos
diff --git a/app/vmrestore/Makefile b/app/vmrestore/Makefile
@@ -71,3 +71,9 @@ vmrestore-local-with-goarch:
 
 vmrestore-pure:
 	APP_NAME=vmrestore $(MAKE) app-local-pure
+
+vmrestore-darwin-amd64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 APP_NAME=vmrestore $(MAKE) app-via-docker-goarch-goos
+
+vmrestore-darwin-arm64-prod:
+	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 APP_NAME=vmrestore $(MAKE) app-via-docker-goarch-goos
diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile
@@ -94,6 +94,11 @@ app-via-docker-goarch:
 	DOCKER_OPTS='--env CGO_ENABLED=$(CGO_ENABLED) --env GOOS=linux --env GOARCH=$(GOARCH)' \
 	$(MAKE) app-via-docker
 
+app-via-docker-goarch-goos:
+	APP_SUFFIX='-$(GOOS)-$(GOARCH)' \
+	DOCKER_OPTS='--env CGO_ENABLED=$(CGO_ENABLED) --env GOOS=$(GOOS) --env GOARCH=$(GOARCH)' \
+	$(MAKE) app-via-docker
+
 app-via-docker-goarch-arm64:
 	APP_SUFFIX='-arm64' \
 	DOCKER_OPTS='--env CGO_ENABLED=1 --env GOOS=linux --env GOARCH=arm64 --env CC=/opt/cross-builder/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc' \