fsfw/fsfw
fsfw
/
fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

Merge pull request 'Odd' (#758) from development-doc-deployment into development
fsfw/fsfw/pipeline/head This commit looks good Details 

Reviewed-on: #758
This commit is contained in:
Ulrich Mohr 2023-10-25 12:39:36 +02:00
parent 5dd4f15b39 515c66a780
commit 8001158c82
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
automation/Dockerfile
View File

@ -7,7 +7,10 @@ RUN apt-get --yes upgrade
ARG DEBIAN_FRONTEND=noninteractive 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 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
COPY docs/requirements.txt .
RUN python3 -m pip install -r requirements.txt
RUN python3 -m pip install breathe
RUN git clone https://github.com/catchorg/Catch2.git && \ RUN git clone https://github.com/catchorg/Catch2.git && \
cd Catch2 && \ cd Catch2 && \

14
automation/Jenkinsfile vendored
View File

@ -6,7 +6,7 @@ pipeline {
} }
agent { agent {
docker { docker {
image 'fsfw-ci:d6' image 'fsfw-ci:d11'
args '--network host --sysctl fs.mqueue.msg_max=100' args '--network host --sysctl fs.mqueue.msg_max=100'
} }
} }
@ -87,10 +87,12 @@ pipeline {
} }
stage('Documentation') { stage('Documentation') {
when { when {
branch 'development' anyOf {
branch 'development';
branch pattern: 'development-doc-deployment*'
}
} }
steps { steps {
sh 'pip install -r docs/requirements.txt'
dir(DOCDDIR) { dir(DOCDDIR) {
sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..' sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..'
sh 'make Sphinx' sh 'make Sphinx'
@ -107,10 +109,12 @@ pipeline {
} }
stage('Master Documentation') { stage('Master Documentation') {
when { when {
branch 'master' anyOf {
branch 'master';
branch pattern: 'master-doc-deployment*'
}
} }
steps { steps {
sh 'pip install -r docs/requirements.txt'
dir(DOCDDIR) { dir(DOCDDIR) {
sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..' sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..'
sh 'make Sphinx' sh 'make Sphinx'