Skip to content

Commit

Permalink
Merge pull request #24 from eclipse/dev_v0.3.1
Browse files Browse the repository at this point in the history
Dev v0.3.1
  • Loading branch information
daniel-gitgit committed Nov 4, 2022
2 parents fd0f77e + 0812082 commit 7e37327
Show file tree
Hide file tree
Showing 117 changed files with 2,058 additions and 570 deletions.
16 changes: 16 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
**.log
**/build
**.vagrant
**.git

**build
**.bag
catkin_workspace/
.config/
.bash_history
.ros
.zsh*
*.sw*
**lizard_report.xml**
**.log
**.vagrant
**.catkin_workspace
**.docker_image_cache**
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@ catkin_workspace/
.ros
.zsh*
*.sw*
**.lizard_report.xml**
**lizard_report.xml**
**.log
**.vagrant
**.catkin
**.docker_image_cache**
54 changes: 24 additions & 30 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -27,39 +27,9 @@
[submodule "adore_if_ros/adore_if_ros_msg"]
path = adore_if_ros/adore_if_ros_msg
url = git@github.com:dlr-ts/adore_if_ros_msg
[submodule "adore_if_ros/cppcheck"]
path = adore_if_ros/cppcheck
url = git@github.com:dlr-ts/cppcheck_docker
ignore = untracked
shallow = true
[submodule "adore_if_ros/cpplint"]
path = adore_if_ros/cpplint
url = git@github.com:dlr-ts/cpplint_docker
ignore = untracked
shallow = true
[submodule "adore_if_ros/lizard"]
path = adore_if_ros/lizard
url = git@github.com:dlr-ts/lizard_docker
ignore = untracked
shallow = true
[submodule "adore_if_ros/plotlablib"]
path = adore_if_ros/plotlablib
url = git@github.com:dlr-ts/plotlablib
[submodule "libadore/cppcheck"]
path = libadore/cppcheck
url = git@github.com:dlr-ts/cppcheck_docker
ignore = untracked
shallow = true
[submodule "libadore/cpplint"]
path = libadore/cpplint
url = git@github.com:dlr-ts/cpplint_docker
ignore = untracked
shallow = true
[submodule "libadore/lizard"]
path = libadore/lizard
url = git@github.com:dlr-ts/lizard_docker
ignore = untracked
shallow = true
[submodule "libadore/libadore/external/Catch2"]
path = libadore/libadore/external/Catch2
url = git@github.com:catchorg/Catch2
Expand Down Expand Up @@ -99,3 +69,27 @@
path = adore_if_ros/make_gadgets
url = git@github.com:DLR-TS/make_gadgets.git
branch = master
[submodule "adore_if_ros/cppcheck_docker"]
path = adore_if_ros/cppcheck_docker
url = git@github.com:DLR-TS/cppcheck_docker.git
branch = master
[submodule "adore_if_ros/lizard_docker"]
path = adore_if_ros/lizard_docker
url = git@github.com:DLR-TS/lizard_docker.git
branch = master
[submodule "adore_if_ros/cpplint_docker"]
path = adore_if_ros/cpplint_docker
url = git@github.com:DLR-TS/cpplint_docker.git
branch = master
[submodule "libadore/cpplint_docker"]
path = libadore/cpplint_docker
url = git@github.com:DLR-TS/cpplint_docker.git
branch = master
[submodule "libadore/cppcheck_docker"]
path = libadore/cppcheck_docker
url = git@github.com:DLR-TS/cppcheck_docker.git
branch = master
[submodule "libadore/lizard_docker"]
path = libadore/lizard_docker
url = git@github.com:DLR-TS/lizard_docker.git
branch = master
7 changes: 2 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,9 @@
-->
## We welcome your contribution!
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).


If you have ideas for extensions or want to change or fix anything:

* Open an issue on github.
* Create a fork of the github project.
* Develop the feature/patch and check the [developer guide](documentation/developer_guide.md)
for details.
* Provide a merge request.
* 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).
* Provide a merge request.
72 changes: 72 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
pipeline {
agent any
options {
disableConcurrentBuilds()
ansiColor('xterm')
lock resource: 'docker'
timeout(time:30 , unit: 'MINUTES')
}
environment {
ADORE_DOCKER_WORKSPACE = "/var/jenkins_home/jobs/docker/jobs/docker/workspace"
OUTPUT_DIRECTORY_BASE = "/var/log/adore/out"
DOCKER_CONFIG="tools"
}
stages {
stage('Build') {
steps {
sh '''#!/usr/bin/env bash
set -e
export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
make
'''
}
}
stage('Test') {
steps {
sh '''#!/usr/bin/env bash
set -e
export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
make test
'''
}
}
stage('Scenarios') {
steps {
sh '''#!/usr/bin/env bash
set -e
export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
export DISPLAY_MODE=headless
make run_test_scenarios
'''
}
}
stage('Static Checks: Lint') {
steps {
sh '''#!/usr/bin/env bash
set -e
export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
make lint
'''
}
}
stage('Static Checks: Static Code Checking') {
steps {
sh '''#!/usr/bin/env bash
set -e
export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
make cppcheck
'''
}
}
stage('Static Checks: Lizard Report') {
steps {
sh '''#!/usr/bin/env bash
set -e
export DOCKER_CONFIG=$(realpath "${DOCKER_CONFIG}") make
make lizard
'''
}
}
}
}

0 comments on commit 7e37327

Please sign in to comment.