KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

typo in Dockerfile

Browse Source
This commit is contained in:
Ulrich Mohr 2022-09-13 14:20:30 +02:00
parent ecf51b2913
commit 9c7248e78e
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
automation/Dockerfile
View File

@ -22,4 +22,4 @@ RUN git clone https://github.com/ETLCPP/etl.git && \
cmake --install build/ cmake --install build/
#ssh needs a valid user to work #ssh needs a valid user to work
RUN adduser -m -u 114 jenkins RUN adduser --uid 114 jenkins

20
automation/Jenkinsfile vendored
View File

@ -41,18 +41,34 @@ pipeline {
} }
} }
stage('Documentation') { stage('Documentation') {
when {
branch 'development'
}
steps { steps {
echo env.BRANCH_NAME
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'
sh 'cd docs/sphinx' sh 'cd docs/sphinx'
sshagent(credentials: ['documentation-buildfix']) { sshagent(credentials: ['documentation-buildfix']) {
sh 'ssh -vvv buildfix@documents.intra.irs.uni-stuttgart.de uname -a'
sh 'scp -r ./* buildfix@documents.intra.irs.uni-stuttgart.de:/mnt/data/www/html/fsfw/development' sh 'scp -r ./* buildfix@documents.intra.irs.uni-stuttgart.de:/mnt/data/www/html/fsfw/development'
} }
} }
} }
} }
stage('Master Documentation') {
when {
branch 'master'
}
steps {
dir(DOCDDIR) {
sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..'
sh 'make Sphinx'
sh 'cd docs/sphinx'
sshagent(credentials: ['documentation-buildfix']) {
sh 'scp -r ./* buildfix@documents.intra.irs.uni-stuttgart.de:/mnt/data/www/html/fsfw/master'
}
}
}
}
} }
} }