diff --git a/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/.gitignore b/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/.gitignore index 019e7c1..52c12a3 100644 --- a/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/.gitignore +++ b/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/.gitignore @@ -149,6 +149,6 @@ vcs.xml /auto {{cookiecutter.thesis_surname}}.pdf {{cookiecutter.thesis_surname}}.zip -autozoil-log.txt +autozoil.xml stats.txt abstract.txt diff --git a/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/Jenkinsfile b/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/Jenkinsfile index 12ee10b..570226c 100644 --- a/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/Jenkinsfile +++ b/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/Jenkinsfile @@ -5,25 +5,59 @@ pipeline { stages { stage ('get-autozoil') { - checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'autozoil']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://gitlab.com/filipg/autozoil.git']]]) + steps { + checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'autozoil']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://gitlab.com/filipg/autozoil.git']]]) + } } stage ('build-pdf') { - sh """ + steps { + sh """ bash build.sh """ + } + post { always { archiveArtifacts artifacts: '{{cookiecutter.thesis_surname}}.pdf', fingerprint: true + archiveArtifacts artifacts: 'stats.txt', fingerprint: true + + plot csvFileName: 'stats.txt', + csvSeries: [[ + file: 'stats.txt', + exclusionValues: '', + displayTableFlag: false, + inclusionFlag: 'OFF', + url: '']], + group: 'Plot Group', + title: 'Plot Title', + style: 'line', + exclZero: false, + keepRecords: false, + logarithmic: false, + numBuilds: '', + useDescr: false, + yaxis: '', + yaxisMaximum: '', + yaxisMinimum: '' } } } stage ('autozoil') { + steps { sh """ AUTOZOIL_DIR=autozoil bash check.sh """ + } + + post { + always { + archiveArtifacts artifacts: 'autozoil.xml', fingerprint: true + junit 'autozoil.xml' + } + } } } diff --git a/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/Makefile b/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/Makefile index 8433226..47f867a 100644 --- a/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/Makefile +++ b/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/Makefile @@ -15,7 +15,7 @@ AUTOZOIL_LOCALE={{cookiecutter.thesis_locale}} CONTENT_TEX_SOURCES_WITH_DIR := $(addprefix $(CURRENT_DIR)/, $(CONTENT_TEX_SOURCES)) SCOREFILES=$(shell perl extract-score-files.pl $(CONTENT_TEX_SOURCES)) -clean_latex_stuff=rm -rf *.aux *.nav *.toc *.log *.out *.blg *.bbl autozoil-log.txt $(THESIS_ID).pdf $(THESIS_ID).zip +clean_latex_stuff=rm -rf *.aux *.nav *.toc *.log *.out *.blg *.bbl autozoil.xml $(THESIS_ID).pdf $(THESIS_ID).zip stats.txt: $(THESIS_ID).pdf helpers/stats.sh bash helpers/stats.sh $< > $@ @@ -31,8 +31,8 @@ scores/%.txt: mkdir -p scores curl "https://gonito.net/api/txt/score/"$* -o $@ -autozoil-log.txt: $(CONTENT_TEX_SOURCES) - cd $(AUTOZOIL_DIR) && set -o pipefail && ./autozoil --locale $(AUTOZOIL_LOCALE) $(CONTENT_TEX_SOURCES_WITH_DIR) --format xml --alt-log-file $(CURRENT_DIR)/$(THESIS_ID).log | tee $(CURRENT_DIR)/$@ +autozoil.xml: $(CONTENT_TEX_SOURCES) + cd $(AUTOZOIL_DIR) && set -o pipefail && ./autozoil --locale $(AUTOZOIL_LOCALE) $(CONTENT_TEX_SOURCES_WITH_DIR) --format xml --alt-log-file $(CURRENT_DIR)/$(THESIS_ID).log > $(CURRENT_DIR)/autozoil.xml $(THESIS_ID).zip: $(clean_latex_stuff) diff --git a/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/check.sh b/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/check.sh index 3b53ab7..872cfaa 100755 --- a/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/check.sh +++ b/{{cookiecutter.thesis_type}}-{{cookiecutter.thesis_surname}}/check.sh @@ -1,3 +1,3 @@ #!/bin/bash -xe -make autozoil-log.txt +make autozoil.xml