chore: update changelog

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

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

 .PHONY: clean
 clean:
 	rm -rf tools

-.PHONY: update-changelog
-update-changelog:
+.PHONY: changelog
+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_PROJECT_VERSION)
+MKT_GITEA_RELEASE_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
@ -1,17 +0,0 @@
-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
wpetit	ae58f166a3	chore: update changelog Cadoles/mktools/pipeline/pr-master This commit looks good Details	2023-08-23 14:49:35 -06:00
wpetit	d767607db7	feat: add changelog	2023-08-23 12:08:09 -06:00
wpetit	93a8977aeb	ci: add jenkins pipeline	2023-08-23 12:08:09 -06:00