Compare commits

...

18 Commits

Author SHA1 Message Date
5084db6cd6 oh, its probably that..
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
2023-12-12 13:59:28 +01:00
5739c4f357 print the rsync version
Some checks failed
fsfw/fsfw/pipeline/head There was a failure building this commit
2023-12-12 13:50:57 +01:00
dc1e7b30f4 maybe rsync is too old for this
Some checks failed
fsfw/fsfw/pipeline/head There was a failure building this commit
2023-12-12 13:29:16 +01:00
d0aa857f0f that should fix coverage upload
Some checks failed
fsfw/fsfw/pipeline/head There was a failure building this commit
2023-12-12 13:16:57 +01:00
15b165d6d8 Revert "update deployment paths"
Some checks failed
fsfw/fsfw/pipeline/head There was a failure building this commit
This reverts commit 81174476be.
2023-12-11 15:06:18 +01:00
bc4730b930 Merge pull request 'update deployment paths' (#759) from update-deployment-paths into development
Some checks failed
fsfw/fsfw/pipeline/head There was a failure building this commit
Reviewed-on: #759
Reviewed-by: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
2023-12-11 14:26:18 +01:00
81174476be update deployment paths
Some checks are pending
fsfw/fsfw/pipeline/head Build started...
fsfw/fsfw/pipeline/pr-development This commit looks good
2023-12-11 14:15:05 +01:00
8001158c82 Merge pull request 'Odd' (#758) from development-doc-deployment into development
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #758
2023-10-25 12:39:36 +02:00
515c66a780 switching to new docker image
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
fsfw/fsfw/pipeline/head This commit looks good
2023-10-25 12:16:32 +02:00
8c20417af9 wrong path 2023-10-25 12:01:40 +02:00
ac817f296b missing COPY in Dockerfile 2023-10-25 11:51:57 +02:00
622ad9ff18 typo
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
2023-10-25 11:40:56 +02:00
f0e4eacac5 this should work
Some checks are pending
fsfw/fsfw/pipeline/head Build started...
fsfw/fsfw/pipeline/pr-development This commit looks good
2023-10-25 11:30:19 +02:00
acc737feb2 Merge branch 'development' into development-doc-test0
Some checks failed
fsfw/fsfw/pipeline/pr-development This commit looks good
fsfw/fsfw/pipeline/head There was a failure building this commit
2023-10-25 11:12:28 +02:00
c9281a3760 should be in docker now
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
2023-10-25 11:11:38 +02:00
cc97c7f82d next test
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
2023-10-25 11:10:49 +02:00
a3b102c0d0 this might work better
Some checks failed
fsfw/fsfw/pipeline/head There was a failure building this commit
fsfw/fsfw/pipeline/pr-development There was a failure building this commit
2023-10-25 11:07:49 +02:00
5dd4f15b39 Merge pull request 'lets check this out' (#756) from switch-doc-theme-to-rtd into development
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
Reviewed-on: #756
2023-10-25 11:06:23 +02:00
2 changed files with 18 additions and 9 deletions

View File

@ -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 && \

View File

@ -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'
}
}
}