Compare commits
18 Commits
switch-doc
...
developmen
Author | SHA1 | Date | |
---|---|---|---|
5084db6cd6 | |||
5739c4f357 | |||
dc1e7b30f4 | |||
d0aa857f0f | |||
15b165d6d8 | |||
bc4730b930 | |||
81174476be | |||
8001158c82 | |||
515c66a780 | |||
8c20417af9 | |||
ac817f296b | |||
622ad9ff18
|
|||
f0e4eacac5
|
|||
acc737feb2 | |||
c9281a3760
|
|||
cc97c7f82d
|
|||
a3b102c0d0
|
|||
5dd4f15b39 |
@ -1,4 +1,4 @@
|
||||
FROM ubuntu:focal
|
||||
FROM ubuntu:latest
|
||||
|
||||
RUN apt-get update
|
||||
RUN apt-get --yes upgrade
|
||||
@ -7,7 +7,10 @@ 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
|
||||
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 && \
|
||||
cd Catch2 && \
|
||||
|
20
automation/Jenkinsfile
vendored
20
automation/Jenkinsfile
vendored
@ -6,7 +6,7 @@ pipeline {
|
||||
}
|
||||
agent {
|
||||
docker {
|
||||
image 'fsfw-ci:d6'
|
||||
image 'fsfw-ci:d12'
|
||||
args '--network host --sysctl fs.mqueue.msg_max=100'
|
||||
}
|
||||
}
|
||||
@ -87,10 +87,13 @@ pipeline {
|
||||
}
|
||||
stage('Documentation') {
|
||||
when {
|
||||
branch 'development'
|
||||
anyOf {
|
||||
branch 'development';
|
||||
branch pattern: 'development-doc-deployment*'
|
||||
}
|
||||
}
|
||||
steps {
|
||||
sh 'pip install -r docs/requirements.txt'
|
||||
sh 'rsync --version'
|
||||
dir(DOCDDIR) {
|
||||
sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..'
|
||||
sh 'make Sphinx'
|
||||
@ -100,17 +103,20 @@ pipeline {
|
||||
}
|
||||
dir(BUILDDIR_LINUX) {
|
||||
sshagent(credentials: ['documentation-buildfix']) {
|
||||
sh 'rsync -r --delete fsfw-tests_coverage/* buildfix@documentation.irs.uni-stuttgart.de:/projects/fsfw/coverage/development'
|
||||
sh 'rsync --mkpath -r --delete fsfw-tests_coverage/* buildfix@documentation.irs.uni-stuttgart.de:/projects/fsfw/coverage/development'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Master Documentation') {
|
||||
when {
|
||||
branch 'master'
|
||||
anyOf {
|
||||
branch 'master';
|
||||
branch pattern: 'master-doc-deployment*'
|
||||
}
|
||||
}
|
||||
steps {
|
||||
sh 'pip install -r docs/requirements.txt'
|
||||
sh 'rsync --version'
|
||||
dir(DOCDDIR) {
|
||||
sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..'
|
||||
sh 'make Sphinx'
|
||||
@ -120,7 +126,7 @@ pipeline {
|
||||
}
|
||||
dir(BUILDDIR_LINUX) {
|
||||
sshagent(credentials: ['documentation-buildfix']) {
|
||||
sh 'rsync -r --delete fsfw-tests_coverage/* buildfix@documentation.irs.uni-stuttgart.de:/projects/fsfw/coverage/master'
|
||||
sh 'rsync --mkpath -r --delete fsfw-tests_coverage/* buildfix@documentation.irs.uni-stuttgart.de:/projects/fsfw/coverage/master'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user