merge upstream development #110

Merged
muellerr merged 70 commits from mohr/merge-upstream into develop 2022-09-15 18:34:50 +02:00
Showing only changes of commit fa5605c959 - Show all commits

View File

@ -44,7 +44,6 @@ pipeline {
} }
} }
stage('Documentation') { stage('Documentation') {
agent any
when { when {
branch 'mohr/documentation_ci' branch 'mohr/documentation_ci'
} }
@ -69,7 +68,7 @@ pipeline {
sh 'make Sphinx' sh 'make Sphinx'
sh 'cd docs/sphinx' sh 'cd docs/sphinx'
sshagent(credentials: ['documentation-buildfix']) { sshagent(credentials: ['documentation-buildfix']) {
sh 'scp -r ./* buildfix@documents.intra.irs.uni-stuttgart.de:/mnt/data/www/html/fsfw/master' sh 'scp -r ./* buildfix@documentation.intra.irs.uni-stuttgart.de:/mnt/data/www/html/fsfw/master'
} }
} }
} }