From a3b102c0d0c83525f5c8d97bffa81c4bcdd30b06 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 25 Oct 2023 11:07:49 +0200 Subject: [PATCH 1/3] this might work better --- automation/Jenkinsfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 94df71470..fa589e053 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -86,8 +86,9 @@ pipeline { } } stage('Documentation') { - when { - branch 'development' + anyOf { + branch 'development'; + branch pattern: 'development-doc*' } steps { sh 'pip install -r docs/requirements.txt' @@ -106,8 +107,9 @@ pipeline { } } stage('Master Documentation') { - when { - branch 'master' + anyOf { + branch 'master'; + branch pattern: 'master-doc*' } steps { sh 'pip install -r docs/requirements.txt' -- 2.34.1 From cc97c7f82dc44583b1b9674107001a46d7024b14 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 25 Oct 2023 11:10:49 +0200 Subject: [PATCH 2/3] next test --- automation/Dockerfile | 4 +++- automation/Jenkinsfile | 16 ++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/automation/Dockerfile b/automation/Dockerfile index 9b96d7bf1..f1fa606c1 100644 --- a/automation/Dockerfile +++ b/automation/Dockerfile @@ -7,7 +7,9 @@ RUN apt-get --yes upgrade ARG DEBIAN_FRONTEND=noninteractive RUN apt-get --yes install gcc g++ cmake make lcov git valgrind nano iputils-ping python3 pip doxygen graphviz rsync -RUN python3 -m pip install sphinx breathe +# This should also install Sphinx +RUN python3 -m pip install -r docs/requirements.txt +RUN python3 -m pip install breathe RUN git clone https://github.com/catchorg/Catch2.git && \ cd Catch2 && \ diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index fa589e053..3ab084343 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -86,9 +86,11 @@ pipeline { } } stage('Documentation') { - anyOf { - branch 'development'; - branch pattern: 'development-doc*' + when { + anyOf { + branch 'development'; + branch pattern: 'development-doc*' + } } steps { sh 'pip install -r docs/requirements.txt' @@ -107,9 +109,11 @@ pipeline { } } stage('Master Documentation') { - anyOf { - branch 'master'; - branch pattern: 'master-doc*' + when { + anyOf { + branch 'master'; + branch pattern: 'master-doc*' + } } steps { sh 'pip install -r docs/requirements.txt' -- 2.34.1 From c9281a376090de685a389eb023e488c972bea80e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 25 Oct 2023 11:11:38 +0200 Subject: [PATCH 3/3] should be in docker now --- automation/Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/automation/Jenkinsfile b/automation/Jenkinsfile index 3ab084343..4fc485ffa 100644 --- a/automation/Jenkinsfile +++ b/automation/Jenkinsfile @@ -93,7 +93,6 @@ pipeline { } } steps { - sh 'pip install -r docs/requirements.txt' dir(DOCDDIR) { sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..' sh 'make Sphinx' @@ -116,7 +115,6 @@ pipeline { } } steps { - sh 'pip install -r docs/requirements.txt' dir(DOCDDIR) { sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..' sh 'make Sphinx' -- 2.34.1