From 6811d6207a33b7215256e8a733d8ac197fbf9b1d Mon Sep 17 00:00:00 2001
From: Andrey Meshkov <am@adguard.com>
Date: Fri, 10 Jul 2020 23:24:43 +0300
Subject: [PATCH] Removed snapshot target

---
 Makefile  | 24 ++++++++++++------------
 README.md |  6 +++++-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index d91f98fe..f577ea7c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,7 @@
 #
 # Building releases:
 #
-# * release -- builds release version of AdGuard Home. CHANNEL must be specified (release or beta).
-# * snapshot -- builds snapshot version of AdGuard Home. Use with CHANNEL=edge.
+# * release -- builds AdGuard Home distros. CHANNEL must be specified (edge, release or beta).
 # * docker-multi-arch -- builds a multi-arch image. If you want it to be pushed to docker hub,
 # 	you must specify:
 #     * DOCKER_IMAGE_NAME - adguard/adguard-home
@@ -25,7 +24,7 @@ PWD := $(shell pwd)
 TARGET=AdGuardHome
 BASE_URL="https://static.adguard.com/adguardhome/$(CHANNEL)"
 
-# See release and snapshot targets
+# See release target
 DIST_DIR=dist
 
 # Update channel. Can be release, beta or edge. Uses edge by default.
@@ -40,6 +39,13 @@ endif
 endif
 endif
 
+# goreleaser command depends on the $CHANNEL
+GORELEASER_COMMAND=goreleaser release --rm-dist --skip-publish --snapshot
+ifneq ($(CHANNEL),edge)
+	# If this is not an "edge" build, use normal release command
+	GORELEASER_COMMAND=goreleaser release --rm-dist --skip-publish
+endif
+
 # Version properties
 COMMIT=$(shell git rev-parse --short HEAD)
 TAG_NAME=$(shell git describe --abbrev=0)
@@ -82,7 +88,7 @@ ifndef DOCKER_IMAGE_NAME
 $(error DOCKER_IMAGE_NAME value is not set)
 endif
 
-.PHONY: all build client client-watch docker lint test dependencies clean release snapshot docker-multi-arch
+.PHONY: all build client client-watch docker lint test dependencies clean release docker-multi-arch
 all: build
 
 build: dependencies client
@@ -156,15 +162,9 @@ docker-multi-arch:
 	@echo If the image was pushed to the registry, you can now run it:
 	@echo docker run --name "adguard-home" -p 53:53/tcp -p 53:53/udp -p 80:80/tcp -p 443:443/tcp -p 853:853/tcp -p 3000:3000/tcp $(DOCKER_IMAGE_NAME)
 
-snapshot: dependencies client
-	@echo Starting snapshot build: version $(VERSION), channel $(CHANNEL)
-	CHANNEL=$(CHANNEL) goreleaser release --rm-dist --skip-publish --snapshot
-	$(call write_version_file,$(VERSION))
-	PATH=$(GOPATH)/bin:$(PATH) packr clean
-
 release: dependencies client
 	@echo Starting release build: version $(VERSION), channel $(CHANNEL)
-	CHANNEL=$(CHANNEL) goreleaser release --rm-dist --skip-publish
+	CHANNEL=$(CHANNEL) $(GORELEASER_COMMAND)
 	$(call write_version_file,$(VERSION))
 	PATH=$(GOPATH)/bin:$(PATH) packr clean
 
@@ -190,8 +190,8 @@ define write_version_file
 	echo "  \"download_windows_386\": \"$(BASE_URL)/AdGuardHome_windows_386.zip\"," >> $(DIST_DIR)/version.json
 
 	# MacOS builds
-	echo "  \"download_darwin_386\": \"$(BASE_URL)/AdGuardHome_darwin_386.zip\"," >> $(DIST_DIR)/version.json
 	echo "  \"download_darwin_amd64\": \"$(BASE_URL)/AdGuardHome_darwin_amd64.zip\"," >> $(DIST_DIR)/version.json
+	echo "  \"download_darwin_386\": \"$(BASE_URL)/AdGuardHome_darwin_386.zip\"," >> $(DIST_DIR)/version.json
 
 	# Linux
 	echo "  \"download_linux_amd64\": \"$(BASE_URL)/AdGuardHome_linux_amd64.tar.gz\"," >> $(DIST_DIR)/version.json
diff --git a/README.md b/README.md
index 9054e504..17421a5d 100644
--- a/README.md
+++ b/README.md
@@ -174,7 +174,11 @@ You'll need this to prepare a release build:
 * [goreleaser](https://goreleaser.com/)
 * [snapcraft](https://snapcraft.io/)
 
-Run `make snapshot` or `make release` to build all AdGuard distrs.
+Commands:
+
+* `make release` - builds a snapshot build (CHANNEL=edge)
+* `CHANNEL=beta make release` - builds beta version, tag is mandatory.
+* `CHANNEL=release make release` - builds release version, tag is mandatory.
 
 #### Docker image