From b9115d6882b3f68a82faf2ffdd6146200e55d319 Mon Sep 17 00:00:00 2001 From: Zakhar Bessarab Date: Tue, 8 Oct 2024 12:19:04 +0400 Subject: [PATCH] make: add darwin builds for cluster (#7195) ### Describe Your Changes Add darwin `amd64` and `arm64` builds for cluster binaries build. ### Checklist The following checks are **mandatory**: - [x] My change adheres [VictoriaMetrics contributing guidelines](https://docs.victoriametrics.com/contributing/). --------- Signed-off-by: hagen1778 Co-authored-by: hagen1778 --- Makefile | 20 +++++++++++++++++++- app/vminsert/Makefile | 12 ++++++++++++ app/vmselect/Makefile | 12 ++++++++++++ app/vmstorage/Makefile | 12 ++++++++++++ docs/changelog/CHANGELOG.md | 2 ++ 5 files changed, 57 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 82c7cebc3..8e8f99ddf 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,16 @@ vmcluster-windows-amd64: \ vmselect-windows-amd64 \ vmstorage-windows-amd64 +vmcluster-darwin-amd64: \ + vminsert-darwin-amd64 \ + vmselect-darwin-amd64 \ + vmstorage-darwin-amd64 + +vmcluster-darwin-arm64: \ + vminsert-darwin-arm64 \ + vmselect-darwin-arm64 \ + vmstorage-darwin-arm64 + crossbuild: vmcluster-crossbuild vmcluster-crossbuild: @@ -113,7 +123,9 @@ release-vmcluster: \ release-vmcluster-linux-arm64 \ release-vmcluster-freebsd-amd64 \ release-vmcluster-openbsd-amd64 \ - release-vmcluster-windows-amd64 + release-vmcluster-windows-amd64 \ + release-vmcluster-darwin-amd64 \ + release-vmcluster-darwin-arm64 release-vmcluster-linux-amd64: GOOS=linux GOARCH=amd64 $(MAKE) release-vmcluster-goos-goarch @@ -130,6 +142,12 @@ release-vmcluster-openbsd-amd64: release-vmcluster-windows-amd64: GOARCH=amd64 $(MAKE) release-vmcluster-windows-goarch +release-vmcluster-darwin-amd64: + GOOS=darwin GOARCH=amd64 $(MAKE) release-vmcluster-goos-goarch + +release-vmcluster-darwin-arm64: + GOOS=darwin GOARCH=arm64 $(MAKE) release-vmcluster-goos-goarch + release-vmcluster-goos-goarch: \ vminsert-$(GOOS)-$(GOARCH)-prod \ vmselect-$(GOOS)-$(GOARCH)-prod \ diff --git a/app/vminsert/Makefile b/app/vminsert/Makefile index c3764e193..c76d990d0 100644 --- a/app/vminsert/Makefile +++ b/app/vminsert/Makefile @@ -39,6 +39,12 @@ vminsert-openbsd-amd64-prod: vminsert-windows-amd64-prod: APP_NAME=vminsert $(MAKE) app-via-docker-windows-amd64 +vminsert-darwin-amd64-prod: + APP_NAME=vminsert $(MAKE) app-via-docker-darwin-amd64 + +vminsert-darwin-arm64-prod: + APP_NAME=vminsert $(MAKE) app-via-docker-darwin-arm64 + vminsert-prod-race: APP_NAME=vminsert RACE=-race $(MAKE) app-via-docker @@ -99,5 +105,11 @@ vminsert-openbsd-amd64: vminsert-windows-amd64: GOARCH=amd64 APP_NAME=vminsert $(MAKE) app-local-windows-goarch +vminsert-darwin-amd64: + APP_NAME=vminsert CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 $(MAKE) app-local-goos-goarch + +vminsert-darwin-arm64: + APP_NAME=vminsert CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 $(MAKE) app-local-goos-goarch + vminsert-pure: APP_NAME=vminsert $(MAKE) app-local-pure diff --git a/app/vmselect/Makefile b/app/vmselect/Makefile index a7f72590d..48ca12f51 100644 --- a/app/vmselect/Makefile +++ b/app/vmselect/Makefile @@ -40,6 +40,12 @@ vmselect-freebsd-amd64-prod: vmselect-openbsd-amd64-prod: APP_NAME=vmselect $(MAKE) app-via-docker-openbsd-amd64 +vmselect-darwin-amd64-prod: + APP_NAME=vmselect $(MAKE) app-via-docker-darwin-amd64 + +vmselect-darwin-arm64-prod: + APP_NAME=vmselect $(MAKE) app-via-docker-darwin-arm64 + vmselect-windows-amd64-prod: APP_NAME=vmselect $(MAKE) app-via-docker-windows-amd64 @@ -103,5 +109,11 @@ vmselect-openbsd-amd64: vmselect-windows-amd64: GOARCH=amd64 APP_NAME=vmselect $(MAKE) app-local-windows-goarch +vmselect-darwin-amd64: + APP_NAME=vmselect CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 $(MAKE) app-local-goos-goarch + +vmselect-darwin-arm64: + APP_NAME=vmselect CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 $(MAKE) app-local-goos-goarch + vmselect-pure: APP_NAME=vmselect $(MAKE) app-local-pure diff --git a/app/vmstorage/Makefile b/app/vmstorage/Makefile index cfc5ac09c..9c8c637a0 100644 --- a/app/vmstorage/Makefile +++ b/app/vmstorage/Makefile @@ -43,6 +43,12 @@ vmstorage-openbsd-amd64-prod: vmstorage-windows-amd64-prod: APP_NAME=vmstorage $(MAKE) app-via-docker-windows-amd64 +vmstorage-darwin-amd64-prod: + APP_NAME=vmstorage $(MAKE) app-via-docker-darwin-amd64 + +vmstorage-darwin-arm64-prod: + APP_NAME=vmstorage $(MAKE) app-via-docker-darwin-arm64 + vmstorage-prod-race: APP_NAME=vmstorage RACE=-race $(MAKE) app-via-docker @@ -103,5 +109,11 @@ vmstorage-openbsd-amd64: vmstorage-windows-amd64: GOARCH=amd64 APP_NAME=vmstorage $(MAKE) app-local-windows-goarch +vmstorage-darwin-amd64: + APP_NAME=vmstorage CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 $(MAKE) app-local-goos-goarch + +vmstorage-darwin-arm64: + APP_NAME=vmstorage CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 $(MAKE) app-local-goos-goarch + vmstorage-pure: APP_NAME=vmstorage $(MAKE) app-local-pure diff --git a/docs/changelog/CHANGELOG.md b/docs/changelog/CHANGELOG.md index dc29df7cd..588ae7fb1 100644 --- a/docs/changelog/CHANGELOG.md +++ b/docs/changelog/CHANGELOG.md @@ -18,6 +18,8 @@ See also [LTS releases](https://docs.victoriametrics.com/lts-releases/). ## tip +* FEATURE: add Darwin binaries for [VictoriaMetrics cluster](https://docs.victoriametrics.com/cluster-victoriametrics/) to the release flow. The binaries will be available in the new release. + ## [v1.104.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.104.0) Released at 2024-10-02