From 7347106694515dee4f3fd77efaba63772a838201 Mon Sep 17 00:00:00 2001 From: cclecle Date: Tue, 28 Mar 2023 00:21:37 +0100 Subject: [PATCH 1/5] test printing changelog parts --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 620b2f3..a6340c4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -624,8 +624,11 @@ pipeline { | + "Reference documentation: [mkdocs page](https://chacha.ddns.net/mkdocs-web/${_PROJECT_USER_NAME}/${PY_PROJECT_NAME}/${_GIT_BRANCH}/${PY_PROJECT_VERSION_STRIPPED}/) " | |LastTag=gitversionhelper.tag.getLastTag(same_branch=True) + |print(f"LastTag= {LastTag}") |CommitHistory=gitversionhelper.commit.getMessagesSinceTag(LastTag, merged_output=True, ignore_merged=True) + |print(f"CommitHistory= {CommitHistory}") |Changelog = ChangelogFactory(CommitHistory).RenderFullChangelog(include_unknown=True) + |print(f"Changelog= {Changelog}") | |ReleaseContent = ReleaseContent + "\\n"+ "\\n"+ "## Changelog:\\n" + Changelog | -- 2.47.3 From 880fa29bbd991be0e76334ae20c92d66e9a10d4c Mon Sep 17 00:00:00 2001 From: cclecle Date: Tue, 28 Mar 2023 00:35:00 +0100 Subject: [PATCH 2/5] try to get changelog before tag creation --- Jenkinsfile | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a6340c4..1cdd63f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -148,6 +148,7 @@ pipeline { PY_PROJECT_NAME = "__NOTSET__" PY_PROJECT_VERSION = "__NOTSET__" PY_PROJECT_VERSION_STRIPPED = "__NOTSET__" + CHANGELOG = "__NOTSET__" } stages { @@ -215,6 +216,33 @@ pipeline { withCredentials([usernamePassword(credentialsId: _SCMCredentials, passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) { sh("git remote set-url origin https://${GIT_USERNAME}:${GIT_PASSWORD}@chacha.ddns.net/gitea/${_PROJECT_USER_NAME}/${_PROJECT_NAME}.git") } + + + CHANGELOG = sh(script: """#!/bin/sh - + |. ~/TOOLS_ENV/bin/activate + |exec python - << '__EOWRAPPER__' + | + |import re + | + |try: + | from pychangelogfactory import ChangelogFactory + |except ImportError: + | from src.pychangelogfactory import ChangelogFactory + | + |try: + | from pygitversionhelper import gitversionhelper + |except ImportError: + | from src.pygitversionhelper import gitversionhelper + | + | + |LastTag=gitversionhelper.tag.getLastTag(same_branch=True) + |CommitHistory=gitversionhelper.commit.getMessagesSinceTag(LastTag, merged_output=True, ignore_merged=True) + |Changelog = ChangelogFactory(CommitHistory).RenderFullChangelog(include_unknown=True) + |print(Changelog) + | + |__EOWRAPPER__ + """.stripMargin(), + returnStdout: true).trim() if(_GIT_BRANCH=="master") { if(sh(returnStdout: true, script: "git tag --points-at HEAD").trim().isEmpty()) { @@ -571,10 +599,6 @@ pipeline { |from simple_rest_client.api import API |from simple_rest_client.resource import Resource | - |try: - | from pychangelogfactory import ChangelogFactory - |except ImportError: - | from src.pychangelogfactory import ChangelogFactory | |try: | from pygitversionhelper import gitversionhelper @@ -623,12 +647,7 @@ pipeline { | + "\\n" \\ | + "Reference documentation: [mkdocs page](https://chacha.ddns.net/mkdocs-web/${_PROJECT_USER_NAME}/${PY_PROJECT_NAME}/${_GIT_BRANCH}/${PY_PROJECT_VERSION_STRIPPED}/) " | - |LastTag=gitversionhelper.tag.getLastTag(same_branch=True) - |print(f"LastTag= {LastTag}") - |CommitHistory=gitversionhelper.commit.getMessagesSinceTag(LastTag, merged_output=True, ignore_merged=True) - |print(f"CommitHistory= {CommitHistory}") - |Changelog = ChangelogFactory(CommitHistory).RenderFullChangelog(include_unknown=True) - |print(f"Changelog= {Changelog}") + |Changelog='''${CHANGELOG}''' | |ReleaseContent = ReleaseContent + "\\n"+ "\\n"+ "## Changelog:\\n" + Changelog | -- 2.47.3 From 82d4b1bd707029bef5563d96a4b32b08af02820e Mon Sep 17 00:00:00 2001 From: cclecle Date: Tue, 28 Mar 2023 00:45:00 +0100 Subject: [PATCH 3/5] fix: remove useless printf in getMessagesSinceTag() --- src/pygitversionhelper/gitversionhelper.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pygitversionhelper/gitversionhelper.py b/src/pygitversionhelper/gitversionhelper.py index e2180f9..a190d9d 100644 --- a/src/pygitversionhelper/gitversionhelper.py +++ b/src/pygitversionhelper/gitversionhelper.py @@ -163,9 +163,7 @@ class gitversionhelper: # pylint: disable=too-few-public-methods the commit message """ current_commit_id = cls.getLast(**kwargs) - print(f"current_commit_id = {current_commit_id}") tag_commit_id = cls.getFromTag(tag) - print(f"tag_commit_id = {tag_commit_id}") str_cmd: str if ("same_branch" in kwargs) and (kwargs["same_branch"] is True): -- 2.47.3 From f7ec5d98a729e8def01ec820a7b9b441fe6f1867 Mon Sep 17 00:00:00 2001 From: cclecle Date: Tue, 28 Mar 2023 00:45:48 +0100 Subject: [PATCH 4/5] fix changelog multiline --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1cdd63f..94c6c77 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -238,7 +238,7 @@ pipeline { |LastTag=gitversionhelper.tag.getLastTag(same_branch=True) |CommitHistory=gitversionhelper.commit.getMessagesSinceTag(LastTag, merged_output=True, ignore_merged=True) |Changelog = ChangelogFactory(CommitHistory).RenderFullChangelog(include_unknown=True) - |print(Changelog) + |print(Changelog.replace("\\n","\\n\\n") | |__EOWRAPPER__ """.stripMargin(), -- 2.47.3 From b01779dd06059636daf649cf84a2118a359b70de Mon Sep 17 00:00:00 2001 From: cclecle Date: Tue, 28 Mar 2023 00:50:43 +0100 Subject: [PATCH 5/5] add missing parentheses --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 94c6c77..7e25170 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -238,7 +238,7 @@ pipeline { |LastTag=gitversionhelper.tag.getLastTag(same_branch=True) |CommitHistory=gitversionhelper.commit.getMessagesSinceTag(LastTag, merged_output=True, ignore_merged=True) |Changelog = ChangelogFactory(CommitHistory).RenderFullChangelog(include_unknown=True) - |print(Changelog.replace("\\n","\\n\\n") + |print(Changelog.replace("\\n","\\n\\n")) | |__EOWRAPPER__ """.stripMargin(), -- 2.47.3