diff --git a/Dockerfile b/Dockerfile index 48309ec59..3403ad2d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,5 +21,5 @@ RUN wget https://github.com/koalaman/shellcheck/releases/download/v0.10.0/shellc && cp shellcheck-v0.10.0/shellcheck /usr/bin/ \ && rm -rf shellcheck-v0.10.0 -RUN apt install -y shunit2 bc sqlite3 bsdmainutils libxml-xpath-perl +RUN apt install -y shunit2 bc sqlite3 bsdmainutils libxml-xpath-perl software-properties-common python3-launchpadlib #USER kworkflow diff --git a/jenkinsfiles/setup_and_doc b/jenkinsfiles/setup_and_doc index dc2fbdf6f..7c1cf4ad8 100644 --- a/jenkinsfiles/setup_and_doc +++ b/jenkinsfiles/setup_and_doc @@ -5,20 +5,12 @@ pipeline { stage('Build'){ steps{ sh ''' + //add-apt-repository ppa:git-core/ppa -y apt update -y - apt install -y shunit2 bc sqlite3 bsdmainutils libxml-xpath-perl - ./run_tests.sh prepare - rm -rf kcov_out - mkdir kcov_out/ - git config --global user.email "kw@kworkflow.net" - git config --global user.name "Kworkflow" - ./run_tests.sh - kcov --include-path=src,kw \ - --exclude-pattern=src/bash_autocomplete.sh,src/help.sh \ - kcov_out/ ./run_tests.sh - mv kcov_out/run_tests.sh.*/cobertura.xml $(pwd)/cobertura.xml + apt install -y python3-docutils python3-sphinx graphviz + ./setup.sh --docs --force + ./setup.sh -i --force ''' - cobertura autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'cobertura.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false } }