diff --git a/ChangeLogTemplate.html b/ChangeLogTemplate.html
deleted file mode 100644
index 3bbe71b1..00000000
--- a/ChangeLogTemplate.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
Git Changelog changelog
-
-
- Changelog of Git Changelog.
-
-
-{{#tags}}
- {{name}}
-{{#issues}} {{#hasIssue}} {{#hasLink}}
- {{name}} {{issue}} {{title}}
-{{/hasLink}} {{^hasLink}}
- {{name}} {{issue}} {{title}}
-{{/hasLink}} {{/hasIssue}} {{^hasIssue}}
- {{name}}
-{{/hasIssue}} {{#commits}}
-{{hash}} {{authorName}} {{commitTime}}
-
-
{{{messageTitle}}}
-
- {{#messageBodyItems}}
- {{.}}
- {{/messageBodyItems}}
-
-{{/commits}} {{/issues}} {{/tags}}
\ No newline at end of file
diff --git a/IOB-WIN/Resources/ChangeLog.html b/IOB-WIN/Resources/ChangeLog.html
index 96910ed3..f080f2db 100644
--- a/IOB-WIN/Resources/ChangeLog.html
+++ b/IOB-WIN/Resources/ChangeLog.html
@@ -4,6 +4,10 @@
Note di rilascio:
+ -
+ Ultime modifiche:
+
+
-
v.1.11.* → v.1.12.*
diff --git a/Jenkinsfile b/Jenkinsfile
index 6469e43b..4f9d6906 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -70,8 +70,6 @@ pipeline {
// BUILD!
bat "\"${tool 'MSBuild-14.0'}\" IOB-WIN/IOB-WIN.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
}
- // compilo changelog...
- step([$class: 'GitChangelogRecorder', config: [createFileTemplateFile: 'ChangeLogTemplate.html', createFileUseTemplateFile: true, customIssues: [[link: '', name: '', pattern: '', title: ''], [link: '', name: '', pattern: '', title: '']], dateFormat: 'YYYY-MM-dd HH:mm:ss', file: 'ChangeLog.html', fromReference: '', fromType: 'firstCommit', ignoreCommitsIfMessageMatches: '^\\[maven-release-plugin\\].*|^\\[Gradle Release Plugin\\].*|^Merge.*', ignoreCommitsWithoutIssue: true, ignoreTagsIfNameMatches: '', jiraIssuePattern: '\\b[a-zA-Z]([a-zA-Z]+)-([0-9]+)\\b', noIssueName: 'No issue', readableTagName: '/([^/]+?)$', showSummary: true, showSummaryTemplateFile: 'ChangeLogTemplate.html', showSummaryUseTemplateFile: true, subDirectory: '', timeZone: 'UTC', toReference: '', toType: 'master', untaggedName: 'Unreleased', useConfigFile: false, useFile: false, useGitHub: false, useGitLab: false, useIgnoreTagsIfNameMatches: false, useJira: false, useMediaWiki: false, useReadableTagName: false, useSubDirectory: false]])
// ora mi occupo delle operazioni di compressione e copia...
script {
// elimino files conf personalizzata per ogni install...
@@ -79,7 +77,8 @@ pipeline {
// manifest.xml: aggiorno versNumber ed URL del branch di update...
bat "fart.exe IOB-WIN\\Resources\\manifest.xml 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
bat "fart.exe IOB-WIN\\Resources\\manifest.xml {{BRANCHNAME}} ${env.BRANCH_NAME} || EXIT /B 0"
- bat "fart.exe IOB-WIN\\Resources\\ChangeLog.html {{CURRENT-REL}} ${env.versionNumber} || EXIT /B 0"
+ bat "fart.exe IOB-WIN\\Resources\\ChangeLog.html {{CURRENT-REL}} ${env.versionNumber} || EXIT /B 0"
+ bat "fart.exe IOB-WIN\\Resources\\ChangeLog.html {{LAST-CHANGES}} ${getChangeString()} || EXIT /B 0"
// copio ed esporto in IIS02 i vari files .xml, .html, .zip
bat "xcopy /y IOB-WIN\\Resources\\manifest.xml c:\\inetpub\\wwwroot\\SWS\\MAPO-IOB-WIN\\${env.BRANCH_NAME}\\ "
bat "xcopy /y IOB-WIN\\Resources\\ChangeLog.html c:\\inetpub\\wwwroot\\SWS\\MAPO-IOB-WIN\\${env.BRANCH_NAME}\\ "
@@ -110,7 +109,8 @@ pipeline {
sendEmail("Failed")
}
unstable {
- mail to:"samuele@steamware.net", subject:"UNSTABLE: ${currentBuild.fullDisplayName}", body: "Build is unstable."
+ // mail to:"samuele@steamware.net", subject:"UNSTABLE: ${currentBuild.fullDisplayName}", body: "Build is unstable."
+ sendEmail("Unstable")
}
}
}
@@ -118,29 +118,29 @@ pipeline {
@NonCPS
def getChangeString() {
- MAX_MSG_LEN = 100
- def changeString = ""
+ MAX_MSG_LEN = 100
+ def changeString = ""
- echo "Gathering SCM changes"
- def changeLogSets = currentBuild.changeSets
- for (int i = 0; i < changeLogSets.size(); i++) {
- def entries = changeLogSets[i].items
- for (int j = 0; j < entries.length; j++) {
- def entry = entries[j]
- truncated_msg = entry.msg.take(MAX_MSG_LEN)
- changeString += " - ${truncated_msg} [${entry.author}]\n"
- }
- }
+ echo "Gathering SCM changes"
+ def changeLogSets = currentBuild.changeSets
+ for (int i = 0; i < changeLogSets.size(); i++) {
+ def entries = changeLogSets[i].items
+ for (int j = 0; j < entries.length; j++) {
+ def entry = entries[j]
+ truncated_msg = entry.msg.take(MAX_MSG_LEN)
+ changeString += " - ${truncated_msg} [${entry.author}]\n"
+ }
+ }
- if (!changeString) {
- changeString = " - No new changes"
- }
- return changeString
+ if (!changeString) {
+ changeString = " - Nessuna Modifica"
+ }
+ return changeString
}
def sendEmail(status) {
mail (
to: "$EMAIL_RECIPIENTS",
subject: "Build $BUILD_NUMBER - " + status + " ($JOB_NAME)",
- body: "Changes:\n " + getChangeString() + "\n\n Check console output at: $BUILD_URL/console" + "\n")
+ body: "Modifiche:\n " + getChangeString() + "\n\n Verifica console output: $BUILD_URL/console" + "\n")
}
\ No newline at end of file