diff --git a/Jenkinsfile b/Jenkinsfile index 7f97115..16b5ec6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,6 +65,8 @@ pipeline { """ } + String currentVersion = sh(script: 'make version', returnStdout: true).trim() + build( job: "../emissary-firmware/${env.GIT_BRANCH}", parameters: [ diff --git a/Makefile b/Makefile index 8e552ce..9d762cc 100644 --- a/Makefile +++ b/Makefile @@ -141,7 +141,7 @@ update-edge-lib: .PHONY: changelog changelog: .mktools - $(MAKE) MKT_GIT_CHGLOG_ARGS='--tag-filter-pattern $(MKT_PROJECT_VERSION_CHANNEL) --output CHANGELOG.md' mkt-changelog + $(MAKE) MKT_GIT_CHGLOG_ARGS='--next-tag $(MKT_PROJECT_VERSION) --tag-filter-pattern $(MKT_PROJECT_VERSION_CHANNEL) --output CHANGELOG.md' mkt-changelog .PHONY: mktools mktools: