Various CI-pipeline fixes (#1042)

* Let Gitler produce a changelog for release builds
* Fix bug in publishing release documentation
* Fix bug in labeling documentation
   (now uses tag data for better tracability)
* Update copyright in documentation
This commit is contained in:
Patrick Fallberg
2018-02-10 20:43:18 +01:00
committed by tekka
parent 72b71c8fc8
commit 968b2daff7
4 changed files with 37 additions and 9 deletions
+1 -1
View File
@@ -19,7 +19,7 @@ def call(config) {
// Publish docs to API server
if (env.BRANCH_NAME == 'master') {
sh """#!/bin/bash
scp -r ${config.repository_root}Documentation/html docs@direct.openhardware.io"""
scp -r ${config.repository_root}Documentation/html docs@direct.openhardware.io:"""
} else if (env.BRANCH_NAME == 'development') {
sh """#!/bin/bash
scp -r ${config.repository_root}Documentation/html docs@direct.openhardware.io:beta"""
+34
View File
@@ -15,7 +15,41 @@ def call(config) {
else if (env.CHANGE_TARGET == 'master')
{
echo env.CHANGE_AUTHOR + ' is a valid author for targeting master branch, skipping further validation'
dir(config.repository_root) {
step([$class: 'GitChangelogRecorder', config: [configFile: 'git-changelog-settings.json',
createFileTemplateContent: '''
# Changelog
{{#commits}}
### {{{messageTitle}}}
{{{messageBody}}}
[{{hash}}](https://github.com/mysensors/MySensors/commit/{{hash}}) by {{authorName}} at *{{commitTime}}*
{{/commits}}
''',
createFileTemplateFile: '', createFileUseTemplateContent: true,
createFileUseTemplateFile: false, customIssues: [[link: '', name: '', pattern: '', title: ''],
[link: '', name: '', pattern: '', title: '']], dateFormat: 'YYYY-MM-dd HH:mm:ss',
file: 'ReleaseNotes.md', fromReference: env.CHANGE_TARGET, fromType: 'ref', gitHubApi: '',
gitHubApiTokenCredentialsId: '', gitHubIssuePattern: '#([0-9]+)', gitHubToken: '',
gitLabApiTokenCredentialsId: '', gitLabProjectName: '', gitLabServer: '', gitLabToken: '',
ignoreCommitsIfMessageMatches: '^Merge.*',
ignoreCommitsWithoutIssue: false, ignoreTagsIfNameMatches: '',
jiraIssuePattern: '\\b[a-zA-Z]([a-zA-Z]+)-([0-9]+)\\b', jiraPassword: '', jiraServer: '',
jiraUsername: '', jiraUsernamePasswordCredentialsId: '', mediaWikiPassword: '',
mediaWikiTemplateContent: '', mediaWikiTemplateFile: '', mediaWikiTitle: '', mediaWikiUrl: '',
mediaWikiUseTemplateContent: false, mediaWikiUseTemplateFile: false, mediaWikiUsername: '',
noIssueName: 'No issue', readableTagName: '/([^/]+?)$', showSummary: false,
showSummaryTemplateContent: '', showSummaryTemplateFile: '', showSummaryUseTemplateContent: false,
showSummaryUseTemplateFile: false, subDirectory: '', timeZone: 'UTC',
toReference: config.git_sha, toType: 'commit', untaggedName: 'Unreleased',
useConfigFile: false, useFile: true, useGitHub: true, useGitHubApiTokenCredentials: false,
useGitLab: false, useGitLabApiTokenCredentials: false, useIgnoreTagsIfNameMatches: false,
useJira: false, useJiraUsernamePasswordCredentialsId: false, useMediaWiki: false,
useReadableTagName: false, useSubDirectory: false]
])
}
config.pr.setBuildStatus(config, 'SUCCESS', 'Toll gate (Gitler)', 'Pass', '')
config.pr.setBuildStatus(config, 'SUCCESS', 'Toll gate (Release changelog)', '', '${BUILD_URL}execution/node/3/ws/MySensors/ReleaseNotes.md/*view*/')
return
}
+1 -7
View File
@@ -7,13 +7,7 @@ echo -e "/**\n * @defgroup RaspberryPiGateway Raspberry Pi Gateway\n * @ingroup
echo -e "@endverbatim\n@}*/\n" >> configure.h
# Generate version information
export PROJECTNUMBER=$(
if [[ $(git rev-parse --abbrev-ref HEAD) == "master" ]]; then
git describe --tags ;
else
git rev-parse --short HEAD ;
fi
)
export PROJECTNUMBER=$(git fetch --tags; git describe --tags;)
# Generate any UML diagrams in the code tree that has the proper tags
export PLANTUML_JAR_PATH=Documentation/plantuml.jar
+1 -1
View File
@@ -5,7 +5,7 @@ Are you a sketch developer/user, see @ref publics
Are you a core/library developer, see @ref internals
@copyright (C) 2013-2017 Sensnology AB
@copyright (C) 2013-2018 Sensnology AB
Full contributor list: https://github.com/mysensors/Arduino/graphs/contributors
*/