From 441822c4ccec0aa8b1245c204d2e365785676f1b Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin <valyala@gmail.com> Date: Fri, 18 Dec 2020 18:27:04 +0200 Subject: [PATCH] Makefile: do not build vmagent, vmalert, vmauth, vmbackup and vmrestore binaries in cluster branch, since they are identical to binaries in single-node version There are subtle differences between these binaries in cluster branch from binaries in single-node branch such as missing `-httpAuth.*` command-line flags. These differences introduce confusion to users, so let's stop building these binaries from cluster version. --- Makefile | 47 +++++------------------------------------------ 1 file changed, 5 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index a6dd9e3d0d..3ee4f9ef3e 100644 --- a/Makefile +++ b/Makefile @@ -15,22 +15,12 @@ GO_BUILDINFO = -X '$(PKG_PREFIX)/lib/buildinfo.Version=$(APP_NAME)-$(shell date all: \ vminsert \ vmselect \ - vmstorage \ - vmagent \ - vmalert \ - vmauth \ - vmbackup \ - vmrestore + vmstorage all-pure: \ vminsert-pure \ vmselect-pure \ - vmstorage-pure \ - vmagent-pure \ - vmalert-pure \ - vmauth-pure \ - vmbackup-pure \ - vmrestore-pure + vmstorage-pure include app/*/Makefile include deployment/*/Makefile @@ -41,33 +31,15 @@ clean: publish: \ publish-vminsert \ publish-vmselect \ - publish-vmstorage \ - publish-vmagent \ - publish-vmalert \ - publish-vmauth \ - publish-vmbackup \ - publish-vmrestore + publish-vmstorage package: \ package-vminsert \ package-vmselect \ - package-vmstorage \ - package-vmagent \ - package-vmalert \ - package-vmauth \ - package-vmbackup \ - package-vmrestore - -vmutils: \ - vmagent \ - vmalert \ - vmauth \ - vmbackup \ - vmrestore + package-vmstorage release: \ - release-vmcluster \ - release-vmutils + release-vmcluster release-vmcluster: \ vminsert-prod \ @@ -76,15 +48,6 @@ release-vmcluster: \ cd bin && tar czf victoria-metrics-$(PKG_TAG).tar.gz vminsert-prod vmselect-prod vmstorage-prod && \ sha256sum victoria-metrics-$(PKG_TAG).tar.gz > victoria-metrics-$(PKG_TAG)_checksums.txt -release-vmutils: \ - vmagent-prod \ - vmalert-prod \ - vmauth-prod \ - vmbackup-prod \ - vmrestore-prod - cd bin && tar czf vmutils-$(PKG_TAG).tar.gz vmagent-prod vmalert-prod vmauth-prod vmbackup-prod vmrestore-prod && \ - sha256sum vmutils-$(PKG_TAG).tar.gz > vmutils-$(PKG_TAG)_checksums.txt - pprof-cpu: go tool pprof -trim_path=github.com/VictoriaMetrics/VictoriaMetrics@ $(PPROF_FILE)