From 6dd4aaf177db6923d05a201fa21994ca7b2411c9 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 15 Aug 2013 16:58:37 -0700 Subject: [PATCH 1/6] add docs job to groovy --- jenkins/jobs.groovy | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index 8e5e385332..20929df3a9 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -140,3 +140,14 @@ parameterizedJob.with { tasks / 'hudson.plugins.postbuildtask.TaskProperties' / script).setValue(curlCommand) } } + +doxygenJob = hifiJob('docs', false) +doxygenJob.with { + configure { project -> + (project / builders).setValue('') + project / publishers / 'hudson.plugins.doxygen.DoxygenArchiver' { + doxyfilePath 'Doxyfile' + keepAll false + } + } +} \ No newline at end of file From 3f5cf8f7143134059e19ef21726e80381b251dd9 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 15 Aug 2013 17:07:12 -0700 Subject: [PATCH 2/6] add missing queue for doxygen job --- jenkins/jobs.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index 20929df3a9..afd5e6529a 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -150,4 +150,6 @@ doxygenJob.with { keepAll false } } -} \ No newline at end of file +} + +queue doxygenJob \ No newline at end of file From d4be99ae2bbeb4b53b92e578c32b47df11e313df Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 15 Aug 2013 17:17:30 -0700 Subject: [PATCH 3/6] add missing folderWhereYouRunDoxygen option --- jenkins/jobs.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index afd5e6529a..ca01c09174 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -148,6 +148,7 @@ doxygenJob.with { project / publishers / 'hudson.plugins.doxygen.DoxygenArchiver' { doxyfilePath 'Doxyfile' keepAll false + folderWhereYouRunDoxygen '' } } } From ab7c5eb1e67144f2c910f635336f571b84069c76 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 15 Aug 2013 17:48:27 -0700 Subject: [PATCH 4/6] comment out docs in seed for now --- jenkins/jobs.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index ca01c09174..8e676de606 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -141,16 +141,16 @@ parameterizedJob.with { } } -doxygenJob = hifiJob('docs', false) +/*doxygenJob = hifiJob('docs', false) doxygenJob.with { configure { project -> (project / builders).setValue('') project / publishers / 'hudson.plugins.doxygen.DoxygenArchiver' { doxyfilePath 'Doxyfile' keepAll false - folderWhereYouRunDoxygen '' + folderWhereYouRunDoxygen ' ' } } } -queue doxygenJob \ No newline at end of file +queue doxygenJob*/ \ No newline at end of file From 2cd83ee9a84b3ba1abd32698e287ff1239a7b45e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 16 Aug 2013 10:36:01 -0700 Subject: [PATCH 5/6] remove selective listening on git push --- jenkins/jobs.groovy | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index 8e676de606..870138760b 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -141,16 +141,20 @@ parameterizedJob.with { } } -/*doxygenJob = hifiJob('docs', false) +doxygenJob = hifiJob('docs', false) doxygenJob.with { + scm { + git(GIT_REPO_URL, 'master') {} + } + configure { project -> (project / builders).setValue('') project / publishers / 'hudson.plugins.doxygen.DoxygenArchiver' { doxyfilePath 'Doxyfile' keepAll false - folderWhereYouRunDoxygen ' ' + folderWhereYouRunDoxygen '' } } } -queue doxygenJob*/ \ No newline at end of file +queue doxygenJob \ No newline at end of file From 1802ccdc7fe781b1078dc05401fecbe59afa8d2d Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 16 Aug 2013 10:42:58 -0700 Subject: [PATCH 6/6] use shell command for doxygen instead of plugin --- jenkins/jobs.groovy | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index 870138760b..24e4779fa1 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -149,11 +149,10 @@ doxygenJob.with { configure { project -> (project / builders).setValue('') - project / publishers / 'hudson.plugins.doxygen.DoxygenArchiver' { - doxyfilePath 'Doxyfile' - keepAll false - folderWhereYouRunDoxygen '' - } + } + + steps { + shell('doxygen') } }