From b07010839c7fc1c43fd5d18f520de88f300666a8 Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@victoriametrics.com>
Date: Mon, 8 Nov 2021 12:29:10 +0200
Subject: [PATCH] Makefile: add `TAG=v... make publish-release` rule for
 building and publishing a release for the given TAG

---
 Makefile              |  6 ++++++
 docs/Release-Guide.md | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index a8dd63e7b..6d5059be8 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,12 @@ release-snap:
 	snapcraft
 	snapcraft upload "victoriametrics_$(PKG_TAG)_multi.snap" --release beta,edge,candidate
 
+publish-release:
+	git checkout $(TAG) && $(MAKE) release publish && \
+		git checkout $(TAG)-cluster && $(MAKE) release publish && \
+		git checkout $(TAG)-enterprise && $(MAKE) release publish && \
+		git checkout $(TAG)-enterprise-cluster && $(MAKE) release publish
+
 release: \
 	release-victoria-metrics \
 	release-vmutils
diff --git a/docs/Release-Guide.md b/docs/Release-Guide.md
index 238dab253..1dc48b31e 100644
--- a/docs/Release-Guide.md
+++ b/docs/Release-Guide.md
@@ -7,10 +7,12 @@ sort: 17
 ## Release version and Docker images
 
 0. Document all the changes for new release in [CHANGELOG.md](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/docs/CHANGELOG.md).
-1. Create release tag with `git tag v1.xx.y` in `master` branch and `git tag v1.xx.y-cluster` in `cluster` branch.
-2. Run `make release` for creating `*.tar.gz` release archive with the corresponding `_checksums.txt` inside `bin` directory.
-3. Run `make publish` for creating and publishing Docker images.
-4. Repeat steps 3-4 for `cluster` branch.
+1. Create the following release tags:
+   * `git tag v1.xx.y` in `master` branch
+   * `git tag v1.xx.y-cluster` in `cluster` branch
+   * `git tag v1.xx.y-enterprise` in `enterprise` branch
+   * `git tag v1.xx.y-enterprise-cluster` in `enterprise-cluster` branch
+2. Run `TAG=v1.xx.y make publish-release`. It will create `*.tar.gz` release archives with the corresponding `_checksums.txt` files inside `bin` directory and publish Docker images for the given `TAG`, `TAG-cluster`, `TAG-enterprise` and `TAG-enterprise-cluster`.
 5. Push release tag to https://github.com/VictoriaMetrics/VictoriaMetrics : `git push origin v1.xx.y`.
 6. Go to https://github.com/VictoriaMetrics/VictoriaMetrics/releases , create new release from the pushed tag on step 5 and upload `*.tar.gz` archive with the corresponding `_checksums.txt` from step 2.