Skip to content

Commit 7e37327

Browse files
daniel-gitgitdaniel-gitgit
authored
Merge pull request #24 from eclipse/dev_v0.3.1
Dev v0.3.1
2 parents fd0f77e + 0812082 commit 7e37327

File tree

117 files changed

+2058
-570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+2058
-570
lines changed

‎.dockerignore‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,18 @@
11
**.log
22
**/build
3+
**.vagrant
4+
**.git
5+
6+
**build
7+
**.bag
8+
catkin_workspace/
9+
.config/
10+
.bash_history
11+
.ros
12+
.zsh*
13+
*.sw*
14+
**lizard_report.xml**
15+
**.log
16+
**.vagrant
17+
**.catkin_workspace
18+
**.docker_image_cache**

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@ catkin_workspace/
77
.ros
88
.zsh*
99
*.sw*
10-
**.lizard_report.xml**
10+
**lizard_report.xml**
1111
**.log
12+
**.vagrant
13+
**.catkin
14+
**.docker_image_cache**

‎.gitmodules‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,39 +27,9 @@
2727
[submodule "adore_if_ros/adore_if_ros_msg"]
2828
path = adore_if_ros/adore_if_ros_msg
2929
url = git@github.com:dlr-ts/adore_if_ros_msg
30-
[submodule "adore_if_ros/cppcheck"]
31-
path = adore_if_ros/cppcheck
32-
url = git@github.com:dlr-ts/cppcheck_docker
33-
ignore = untracked
34-
shallow = true
35-
[submodule "adore_if_ros/cpplint"]
36-
path = adore_if_ros/cpplint
37-
url = git@github.com:dlr-ts/cpplint_docker
38-
ignore = untracked
39-
shallow = true
40-
[submodule "adore_if_ros/lizard"]
41-
path = adore_if_ros/lizard
42-
url = git@github.com:dlr-ts/lizard_docker
43-
ignore = untracked
44-
shallow = true
4530
[submodule "adore_if_ros/plotlablib"]
4631
path = adore_if_ros/plotlablib
4732
url = git@github.com:dlr-ts/plotlablib
48-
[submodule "libadore/cppcheck"]
49-
path = libadore/cppcheck
50-
url = git@github.com:dlr-ts/cppcheck_docker
51-
ignore = untracked
52-
shallow = true
53-
[submodule "libadore/cpplint"]
54-
path = libadore/cpplint
55-
url = git@github.com:dlr-ts/cpplint_docker
56-
ignore = untracked
57-
shallow = true
58-
[submodule "libadore/lizard"]
59-
path = libadore/lizard
60-
url = git@github.com:dlr-ts/lizard_docker
61-
ignore = untracked
62-
shallow = true
6333
[submodule "libadore/libadore/external/Catch2"]
6434
path = libadore/libadore/external/Catch2
6535
url = git@github.com:catchorg/Catch2
@@ -99,3 +69,27 @@
9969
path = adore_if_ros/make_gadgets
10070
url = git@github.com:DLR-TS/make_gadgets.git
10171
branch = master
72+
[submodule "adore_if_ros/cppcheck_docker"]
73+
path = adore_if_ros/cppcheck_docker
74+
url = git@github.com:DLR-TS/cppcheck_docker.git
75+
branch = master
76+
[submodule "adore_if_ros/lizard_docker"]
77+
path = adore_if_ros/lizard_docker
78+
url = git@github.com:DLR-TS/lizard_docker.git
79+
branch = master
80+
[submodule "adore_if_ros/cpplint_docker"]
81+
path = adore_if_ros/cpplint_docker
82+
url = git@github.com:DLR-TS/cpplint_docker.git
83+
branch = master
84+
[submodule "libadore/cpplint_docker"]
85+
path = libadore/cpplint_docker
86+
url = git@github.com:DLR-TS/cpplint_docker.git
87+
branch = master
88+
[submodule "libadore/cppcheck_docker"]
89+
path = libadore/cppcheck_docker
90+
url = git@github.com:DLR-TS/cppcheck_docker.git
91+
branch = master
92+
[submodule "libadore/lizard_docker"]
93+
path = libadore/lizard_docker
94+
url = git@github.com:DLR-TS/lizard_docker.git
95+
branch = master

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@
1212
-->
1313
## We welcome your contribution!
1414
Currently ADORe is a small project and yout can contact us with any question or feedback at [adore-dev@eclipse.org](mailto:adore-dev@eclipse.org).
15-
16-
1715
If you have ideas for extensions or want to change or fix anything:
18-
16+
* Open an issue on github.
1917
* Create a fork of the github project.
2018
* Develop the feature/patch and check the [developer guide](documentation/developer_guide.md)
2119
for details.
22-
* Provide a merge request.
23-
* If it is the first time that you contribute, please don't forget to add yourself to the list of contributors in the [README](README.md).
20+
* Provide a merge request.

‎Jenkinsfile‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
pipeline {
2+
agent any
3+
options {
4+
disableConcurrentBuilds()
5+
ansiColor('xterm')
6+
lock resource: 'docker'
7+
timeout(time:30 , unit: 'MINUTES')
8+
}
9+
environment {
10+
ADORE_DOCKER_WORKSPACE = "/var/jenkins_home/jobs/docker/jobs/docker/workspace"
11+
OUTPUT_DIRECTORY_BASE = "/var/log/adore/out"
12+
DOCKER_CONFIG="tools"
13+
}
14+
stages {
15+
stage('Build') {
16+
steps {
17+
sh '''#!/usr/bin/env bash
18+
set -e
19+
export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
20+
make
21+
'''
22+
}
23+
}
24+
stage('Test') {
25+
steps {
26+
sh '''#!/usr/bin/env bash
27+
set -e
28+
export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
29+
make test
30+
'''
31+
}
32+
}
33+
stage('Scenarios') {
34+
steps {
35+
sh '''#!/usr/bin/env bash
36+
set -e
37+
export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
38+
export DISPLAY_MODE=headless
39+
make run_test_scenarios
40+
'''
41+
}
42+
}
43+
stage('Static Checks: Lint') {
44+
steps {
45+
sh '''#!/usr/bin/env bash
46+
set -e
47+
export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
48+
make lint
49+
'''
50+
}
51+
}
52+
stage('Static Checks: Static Code Checking') {
53+
steps {
54+
sh '''#!/usr/bin/env bash
55+
set -e
56+
export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
57+
make cppcheck
58+
'''
59+
}
60+
}
61+
stage('Static Checks: Lizard Report') {
62+
steps {
63+
sh '''#!/usr/bin/env bash
64+
set -e
65+
export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
66+
make lizard
67+
'''
68+
}
69+
}
70+
}
71+
}
72+

0 commit comments

Comments
 (0)