feat: use new versioning schema with changelog generation

Makefile

@@ -5,12 +5,9 @@ GITCHLOG_ARGS ?=
 SHELL := /bin/bash
 
 EMISSARY_VERSION ?= 
-GIT_VERSION := $(shell git describe --always)
-DATE_VERSION := $(shell date +%Y.%-m.%-d)
-FULL_VERSION := v$(DATE_VERSION)-$(GIT_VERSION)$(if $(shell git diff --stat),-dirty,)
 
 DOCKER_IMAGE_NAME ?= bornholm/emissary
-DOCKER_IMAGE_TAG ?= $(FULL_VERSION)
+DOCKER_IMAGE_TAG ?= $(MKT_PROJECT_VERSION)
 
 GOTEST_ARGS ?= -short
 
@@ -45,7 +42,7 @@ build-emissary-%: deps ## Build executable
 		-v \
 		-ldflags "\
 			-X 'main.GitRef=$(shell git rev-parse --short HEAD)' \
-			-X 'main.ProjectVersion=$(FULL_VERSION)' \
+			-X 'main.ProjectVersion=$(MKT_PROJECT_VERSION)' \
 			-X 'main.BuildDate=$(shell date --utc --rfc-3339=seconds)' \
 		" \
 		-o ./bin/$* \
@@ -66,7 +63,7 @@ run-emissary-%: .env
 	( set -o allexport && source .env && set +o allexport && bin/$* $(EMISSARY_CMD))
 
 .PHONY: deps
-deps: .env
+deps: .env .mktools
 
 .PHONY: dump-config
 dump-config: build-emissary
@@ -74,27 +71,8 @@ dump-config: build-emissary
 	./bin/emissary config dump > tmp/config.yml
 
 .PHONY: goreleaser
-goreleaser: deps
-	( set -o allexport && source .env && set +o allexport && VERSION=$(GORELEASER_VERSION) curl -sfL https://goreleaser.com/static/run | GORELEASER_CURRENT_TAG="$(FULL_VERSION)" bash /dev/stdin $(GORELEASER_ARGS) )
-
-.PHONY: start-release
-start-release:
-	if [ -z "$(EMISSARY_VERSION)" ]; then echo "You must define environment variable FAQD_VERSION"; exit 1; fi
-	
-	git flow release start $(EMISSARY_VERSION)
-
-	# Update package.json version
-	jq '.version = "$(EMISSARY_VERSION)"' package.json | sponge package.json
-	git add  package.json
-	git commit -m "chore: bump to version $(EMISSARY_VERSION)" --allow-empty
-
-	echo "Commit you additional modifications then execute 'make finish-release'"
-
-.PHONY: finish-release
-finish-release:
-	git flow release finish -m "v$(EMISSARY_VERSION)"
-	git push --all
-	git push --tags
+goreleaser: .mktools
+	( set -o allexport && source .env && set +o allexport && VERSION=$(GORELEASER_VERSION) curl -sfL https://goreleaser.com/static/run | GORELEASER_CURRENT_TAG="$(MKT_PROJECT_VERSION)" bash /dev/stdin $(GORELEASER_ARGS) )
 
 install-git-hooks:
 	git config core.hooksPath .githooks
@@ -119,7 +97,7 @@ deploy-openwrt-agent:
 	scp dist/emissary-agent_linux_arm_6/emissary root@$(OPENWRT_DEVICE):/usr/bin/emissary
 	ssh root@$(OPENWRT_DEVICE) /etc/init.d/emissary-agent start
 
-gitea-release: tools/gitea-release/bin/gitea-release.sh goreleaser
+gitea-release: .mktools tools/gitea-release/bin/gitea-release.sh goreleaser
 	mkdir -p .gitea-release
 	rm -rf .gitea-release/*
 
@@ -130,19 +108,14 @@ gitea-release: tools/gitea-release/bin/gitea-release.sh goreleaser
 	GITEA_RELEASE_PROJECT="emissary" \
 		GITEA_RELEASE_ORG="arcad" \
 		GITEA_RELEASE_BASE_URL="https://forge.cadoles.com" \
-		GITEA_RELEASE_VERSION="$(FULL_VERSION)" \
-		GITEA_RELEASE_NAME="$(FULL_VERSION)" \
+		GITEA_RELEASE_VERSION="$(MKT_PROJECT_VERSION)" \
+		GITEA_RELEASE_NAME="$(MKT_PROJECT_VERSION)" \
 		GITEA_RELEASE_COMMITISH_TARGET="$(GIT_VERSION)" \
 		GITEA_RELEASE_IS_DRAFT="false" \
 		GITEA_RELEASE_BODY="" \
 		GITEA_RELEASE_ATTACHMENTS="$$(find .gitea-release/* -type f)" \
 		tools/gitea-release/bin/gitea-release.sh
 
-tools/gitea-release/bin/gitea-release.sh:
-	mkdir -p tools/gitea-release/bin
-	curl --output tools/gitea-release/bin/gitea-release.sh https://forge.cadoles.com/Cadoles/Jenkins/raw/branch/master/resources/com/cadoles/gitea/gitea-release.sh
-	chmod +x tools/gitea-release/bin/gitea-release.sh
-
 .emissary-token:
 	$(MAKE) run-emissary-server EMISSARY_CMD="--debug --config tmp/server.yml server auth create-token --role writer > .emissary-token"
 
@@ -153,8 +126,8 @@ load-sample-specs:
 	cat misc/spec-samples/proxy.emissary.cadoles.com.json | ./bin/server api agent spec update -a $(AGENT_ID) --no-patch --spec-data - --spec-name proxy.emissary.cadoles.com
 	cat misc/spec-samples/mdns.emissary.cadoles.com.json | ./bin/server api agent spec update -a $(AGENT_ID) --no-patch --spec-data - --spec-name mdns.emissary.cadoles.com
 
-full-version:
-	@echo $(FULL_VERSION)
+version: .mktools
+	@echo $(MKT_PROJECT_VERSION)
 
 update-edge-lib:
 	git pull --rebase
@@ -163,4 +136,18 @@ update-edge-lib:
 	$(MAKE) test
 	git add go.mod go.sum
 	git commit -m "feat: update arcad/edge dependency"
-	git push
+	git push
+
+.PHONY: changelog
+changelog: .mktools
+	$(MAKE) mkt-changelog
+
+.PHONY: mktools
+mktools:
+	rm -rf .mktools
+	curl -q https://forge.cadoles.com/Cadoles/mktools/raw/branch/master/install.sh | $(SHELL)
+
+.mktools:
+	$(MAKE) mktools
+
+-include .mktools/*.mk