fsfw/fsfw
11
3
Fork 6
Code Issues32 Pull Requests4 Releases10 Wiki Activity

Compare commits

...

10 Commits
docker_d10 ... developmen

Author SHA1 Message Date
Robin Mueller
5084db6cd6 oh, its probably that.. 2023-12-12 13:59:28 +01:00
Robin Mueller
5739c4f357 print the rsync version 2023-12-12 13:50:57 +01:00
Robin Mueller
dc1e7b30f4 maybe rsync is too old for this 2023-12-12 13:29:16 +01:00
Robin Mueller
d0aa857f0f that should fix coverage upload 2023-12-12 13:16:57 +01:00
Ulrich Mohr
15b165d6d8 Revert "update deployment paths" 
This reverts commit 81174476be.
 2023-12-11 15:06:18 +01:00
Ulrich Mohr
bc4730b930 Merge pull request 'update deployment paths' () from update-deployment-paths into development 
Reviewed-on: 
Reviewed-by: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
 2023-12-11 14:26:18 +01:00
Robin Mueller
81174476be update deployment paths 2023-12-11 14:15:05 +01:00
Ulrich Mohr
8001158c82 Merge pull request 'Odd' () from development-doc-deployment into development 
Reviewed-on:
2023-10-25 12:39:36 +02:00
Ulrich Mohr
515c66a780 switching to new docker image 2023-10-25 12:16:32 +02:00
Ulrich Mohr
8c20417af9 wrong path 2023-10-25 12:01:40 +02:00
2 changed files with 7 additions and 5 deletions

4
automation/Dockerfile

@ -1,4 +1,4 @@
FROM ubuntu:focal
FROM ubuntu:latest
RUN apt-get update
RUN apt-get --yes upgrade
@ -9,7 +9,7 @@ RUN apt-get --yes install gcc g++ cmake make lcov git valgrind nano iputils-ping
# This should also install Sphinx
COPY docs/requirements.txt .
RUN python3 -m pip install -r 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 && \

8
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'
}
}
@ -93,6 +93,7 @@ pipeline {
}
}
steps {
sh 'rsync --version'
dir(DOCDDIR) {
sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..'
sh 'make Sphinx'
@ -102,7 +103,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/development'
sh 'rsync --mkpath -r --delete fsfw-tests_coverage/* buildfix@documentation.irs.uni-stuttgart.de:/projects/fsfw/coverage/development'
}
}
}
@ -115,6 +116,7 @@ pipeline {
}
}
steps {
sh 'rsync --version'
dir(DOCDDIR) {
sh 'cmake -DFSFW_BUILD_DOCS=ON -DFSFW_OSAL=host ..'
sh 'make Sphinx'
@ -124,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'
}
}
}