ci: fix release version passed to emissary-firmware pipeline

ci: fix changelog version generation
2023-08-25 10:52:27 -06:00 · 2023-08-25 10:45:15 -06:00
2 changed files with 3 additions and 1 deletions
--- a/2
+++ b/2
@ -65,6 +65,8 @@ pipeline {
                        """
                    }

+                    String currentVersion = sh(script: "MKT_PROJECT_VERSION_BRANCH_NAME=${env.BRANCH_NAME} make version", returnStdout: true).trim()
+
                    build(
                        job: "../emissary-firmware/${env.GIT_BRANCH}",
                        parameters: [
--- a/2
+++ b/2
@ -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:
Author	SHA1	Message	Date
William Petit	077964c7b9	ci: fix release version passed to emissary-firmware pipeline All checks were successful arcad/emissary/pipeline/head This commit looks good Details	2023-08-25 10:52:27 -06:00
William Petit	3af6324121	ci: fix changelog version generation All checks were successful arcad/emissary/pipeline/head This commit looks good Details	2023-08-25 10:45:15 -06:00