chore: update changelog

feat: add changelog
ci: add jenkins pipeline
2023-08-23 14:53:02 -06:00 · 2023-08-23 14:53:02 -06:00 · 2023-08-23 14:53:02 -06:00
3 changed files with 32 additions and 5 deletions
--- a/18
+++ b/18
@ -8,16 +8,26 @@ test: tools/checkmake/bin/checkmake
 .PHONY: build
 build:

+MKT_GITEA_RELEASE_ORG ?= Cadoles
+MKT_GITEA_RELEASE_PROJECT ?= mktools
+
 .PHONY: release
-release: changelog
-	$(MAKE) MKT_GITEA_RELEASE_ATTACHMENTS="CHANGELOG.md" mkt-gitea-release
+release:
+	$(MAKE) update-changelog
+	$(MAKE) \
+		MKT_GITEA_RELEASE_ATTACHMENTS="CHANGELOG.md" \
+		mkt-gitea-release
+

 .PHONY: clean
 clean:
 	rm -rf tools

-.PHONY: changelog
-changelog:
+.PHONY: update-changelog
+update-changelog:
 	$(MAKE) MKT_GIT_CHGLOG_PROJECT_ORG=Cadoles MKT_GIT_CHGLOG_PROJECT_NAME=mktools mkt-changelog
+	git add CHANGELOG.md
+	git commit -m "chore: update changelog"
+	git push --tags

 include tasks/*.mk
--- a/tasks/gitea.mk
+++ b/tasks/gitea.mk
@ -1,7 +1,7 @@
 MKT_GITEA_RELEASE_PROJECT ?=
 MKT_GITEA_RELEASE_ORG ?=
 MKT_GITEA_RELEASE_BASE_URL ?= https://forge.cadoles.com
-MKT_GITEA_RELEASE_VERSION ?=
+MKT_GITEA_RELEASE_VERSION ?= $(MKT_PROJECT_VERSION)
 MKT_GITEA_RELEASE_COMMIT_TARGET ?= $(shell git rev-parse HEAD)
 MKT_GITEA_RELEASE_IS_DRAFT ?= false
 MKT_GITEA_RELEASE_BODY ?= 
--- a/tasks/version.mk
+++ b/tasks/version.mk
@ -0,0 +1,17 @@
+MKT_PROJECT_VERSION_CHANNEL ?= $(shell git rev-parse --abbrev-ref HEAD | tr '[:upper:]' '[:lower:]' | sed -e 's/[-_ ]//g')
+
+ifeq ($(MKT_PROJECT_VERSION_CHANNEL),develop)
+    MKT_PROJECT_SHORT_VERSION_CHANNEL ?= dev
+else ifeq ($(MKT_PROJECT_VERSION_CHANNEL),testing)
+	MKT_PROJECT_SHORT_VERSION_CHANNEL ?= tst
+else ifeq ($(MKT_PROJECT_VERSION_CHANNEL),stable)
+	MKT_PROJECT_SHORT_VERSION_CHANNEL ?= stb
+else
+	MKT_PROJECT_SHORT_VERSION_CHANNEL ?= $(shell echo "$(MKT_PROJECT_VERSION_CHANNEL)" | sed -e 's/[aeiouy]//g' | cut -c1-3)
+endif
+
+MKT_PROJECT_VERSION_DATE ?= $(shell date +%Y.%-m.%-d)
+MKT_PROJECT_VERSION_TIMESTAMP ?= $(shell date +%-H%M)
+
+MKT_PROJECT_VERSION ?= $(MKT_PROJECT_VERSION_DATE)-$(MKT_PROJECT_VERSION_CHANNEL).$(MKT_PROJECT_VERSION_TIMESTAMP).$(shell git rev-parse --short HEAD)
+MKT_PROJECT_SHORT_VERSION ?= $(MKT_PROJECT_VERSION_DATE)-$(MKT_PROJECT_SHORT_VERSION_CHANNEL).$(MKT_PROJECT_VERSION_TIMESTAMP)
Author	SHA1	Message	Date
William Petit	48bcb9c57e	chore: update changelog All checks were successful Cadoles/mktools/pipeline/pr-master This commit looks good Details	2023-08-23 14:53:02 -06:00
William Petit	01fc3bb0be	feat: add changelog	2023-08-23 14:53:02 -06:00
William Petit	3a76185c3c	ci: add jenkins pipeline	2023-08-23 14:53:02 -06:00