Skip to content

Commit cd57316

Browse files
author
AndyZe
authored
Merge pull request #84 from PickNikRobotics/destogl/fix-formating
Fix formating
2 parents 84edca5 + 369e60f commit cd57316

35 files changed

+448
-657
lines changed

‎.clang-format‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ BreakBeforeBraces: Custom
5353
BraceWrapping:
5454
AfterCaseLabel: 'true'
5555
AfterClass: 'true'
56-
AfterControlStatement: 'true'
56+
AfterControlStatement: Never
5757
AfterEnum : 'true'
5858
AfterFunction : 'true'
5959
AfterNamespace : 'true'
6060
AfterStruct : 'true'
6161
AfterUnion : 'true'
62-
BeforeCatch : 'true'
63-
BeforeElse : 'true'
62+
BeforeCatch : 'false'
63+
BeforeElse : 'false'
6464
IndentBraces : 'false'
6565
...

‎.github/workflows/ci-build.yml‎ renamed to ‎.github/workflows/ci-build-binary.yml‎

File renamed without changes.

‎.github/workflows/ci-format.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v2
2020
- uses: actions/setup-python@v2
21-
- name: Install clang-format-10
21+
- name: Install system hooks
2222
run: sudo apt-get install clang-format-10 cppcheck
23-
- uses: pre-commit/[email protected]
23+
- uses: pre-commit/[email protected]
24+
with:
25+
extra_args: --all-files --hook-stage manual

‎.github/workflows/ci-ros-lint.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: ROS2 Lint
2+
on:
3+
pull_request:
4+
5+
jobs:
6+
ament_lint:
7+
name: ament_${{ matrix.linter }}
8+
runs-on: ubuntu-20.04
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
linter: [cppcheck, copyright, lint_cmake]
13+
steps:
14+
- uses: actions/checkout@v1
15+
- uses: ros-tooling/[email protected]
16+
- uses: ros-tooling/[email protected]
17+
with:
18+
distribution: foxy
19+
linter: ${{ matrix.linter }}
20+
package-name:
21+
ur_bringup
22+
ur_controllers
23+
ur_dashboard_msgs
24+
ur_description
25+
ur_moveit_config
26+
ur_robot_driver
27+
28+
ament_lint_120:
29+
name: ament_${{ matrix.linter }}
30+
runs-on: ubuntu-20.04
31+
strategy:
32+
fail-fast: false
33+
matrix:
34+
linter: [cpplint]
35+
steps:
36+
- uses: actions/checkout@v1
37+
- uses: ros-tooling/[email protected]
38+
- uses: ros-tooling/[email protected]
39+
with:
40+
distribution: foxy
41+
linter: cpplint
42+
arguments: "--linelength=120"
43+
package-name:
44+
ur_bringup
45+
ur_controllers
46+
ur_dashboard_msgs
47+
ur_description
48+
ur_moveit_config
49+
ur_robot_driver

‎.github/workflows/ci-ursim.yml‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
1-
#name: UR Sim
2-
#on:
3-
#pull_request:
4-
#push:
1+
name: UR Sim
2+
on:
3+
# pull_request:
4+
push:
5+
branches:
6+
- devel
57

6-
#jobs:
7-
#ci_binary:
8-
#name: foxy UR Sim
9-
#runs-on: ubuntu-latest
10-
#strategy:
11-
#matrix:
12-
#env:
13-
#- {ROS_DISTRO: foxy, ROS_REPO: main}
14-
#- {ROS_DISTRO: foxy, ROS_REPO: testing}
15-
#env:
16-
#UPSTREAM_WORKSPACE: Universal_Robots_ROS2_Driver.ci.repos
17-
#DOCKER_RUN_OPTS: --network static_test_net
18-
#BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
19-
#IMMEDIATE_TEST_OUTPUT: true
20-
#steps:
21-
#- uses: actions/checkout@v1
22-
#- name: start ursim
23-
#run: |
24-
#.github/dockerursim/build_and_run_docker_ursim.sh
25-
#- uses: 'ros-industrial/industrial_ci@master'
26-
#env: ${{matrix.env}}
8+
jobs:
9+
ci_binary:
10+
name: foxy UR Sim
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
env:
15+
- {ROS_DISTRO: foxy, ROS_REPO: main}
16+
- {ROS_DISTRO: foxy, ROS_REPO: testing}
17+
env:
18+
UPSTREAM_WORKSPACE: Universal_Robots_ROS2_Driver.ci.repos
19+
DOCKER_RUN_OPTS: --network static_test_net
20+
BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
21+
IMMEDIATE_TEST_OUTPUT: true
22+
steps:
23+
- uses: actions/checkout@v1
24+
- name: start ursim
25+
run: |
26+
.github/dockerursim/build_and_run_docker_ursim.sh
27+
- uses: 'ros-industrial/industrial_ci@master'
28+
env: ${{matrix.env}}

‎.pre-commit-config.yaml‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,21 @@ repos:
2929
- id: end-of-file-fixer
3030
- id: mixed-line-ending
3131
- id: trailing-whitespace
32+
- id: check-byte-order-marker # Forbid UTF-8 byte-order markers
3233

3334
# Python hooks
35+
- repo: https://github.com/asottile/pyupgrade
36+
rev: v2.7.2
37+
hooks:
38+
- id: pyupgrade
39+
args: [--py36-plus]
40+
41+
- repo: https://github.com/psf/black
42+
rev: 20.8b1
43+
hooks:
44+
- id: black
45+
args: ["--line-length=100"]
46+
3447
# PEP 257
3548
- repo: https://github.com/FalconSocial/pre-commit-mirrors-pep257
3649
rev: v0.3.3
@@ -44,12 +57,6 @@ repos:
4457
- id: flake8
4558
args: ["--ignore=E501"]
4659

47-
- repo: https://github.com/psf/black
48-
rev: 20.8b1
49-
hooks:
50-
- id: black
51-
args: ["--line-length=100"]
52-
5360
# CPP hooks
5461
# The same options as in ament_cppcheck are used, but its not working...
5562
#- repo: https://github.com/pocc/pre-commit-hooks
@@ -63,6 +70,7 @@ repos:
6370
- id: ament_cppcheck
6471
name: ament_cppcheck
6572
description: Static code analysis of C/C++ files.
73+
stages: [commit]
6674
entry: ament_cppcheck
6775
language: system
6876
files: \.(h\+\+|h|hh|hxx|hpp|cuh|c|cc|cpp|cu|c\+\+|cxx|tpp|txx)$
@@ -73,6 +81,7 @@ repos:
7381
- id: ament_cpplint
7482
name: ament_cpplint
7583
description: Static code analysis of C/C++ files.
84+
stages: [commit]
7685
entry: ament_cpplint
7786
language: system
7887
files: \.(h\+\+|h|hh|hxx|hpp|cuh|c|cc|cpp|cu|c\+\+|cxx|tpp|txx)$
@@ -94,6 +103,7 @@ repos:
94103
- id: ament_lint_cmake
95104
name: ament_lint_cmake
96105
description: Check format of CMakeLists.txt files.
106+
stages: [commit]
97107
entry: ament_lint_cmake
98108
language: system
99109
files: CMakeLists.txt$
@@ -104,6 +114,7 @@ repos:
104114
- id: ament_copyright
105115
name: ament_copyright
106116
description: Check if copyright notice is available in all files.
117+
stages: [commit]
107118
entry: ament_copyright
108119
language: system
109120

‎CONTRIBUTING.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Please try to include as much information as you can. Details like these are inc
1919
* Any modifications you've made relevant to the bug
2020
* Anything unusual about your environment or deployment
2121

22+
2223
## Contributing via Pull Requests
2324
Contributions via pull requests are much appreciated.
2425
Before sending us a pull request, please ensure that:
@@ -39,3 +40,17 @@ To send us a pull request, please:
3940

4041
GitHub provides additional documentation on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
4142
[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
43+
44+
45+
## Licensing
46+
Any contribution that you make to this repository will be under the Apache 2 License, as dictated by that [license]:
47+
48+
~~~
49+
5. Submission of Contributions. Unless You explicitly state otherwise,
50+
any Contribution intentionally submitted for inclusion in the Work
51+
by You to the Licensor shall be under the terms and conditions of
52+
this License, without any additional terms or conditions.
53+
Notwithstanding the above, nothing herein shall supersede or modify
54+
the terms of any separate license agreement you may have executed
55+
with Licensor regarding such Contributions.
56+
~~~

‎ur_bringup/launch/ur10.launch.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,4 @@ def generate_launch_description():
6969
}.items(),
7070
)
7171

72-
return LaunchDescription(
73-
declared_arguments
74-
+ [
75-
base_launch,
76-
]
77-
)
72+
return LaunchDescription(declared_arguments + [base_launch])

‎ur_bringup/launch/ur10e.launch.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,4 @@ def generate_launch_description():
6969
}.items(),
7070
)
7171

72-
return LaunchDescription(
73-
declared_arguments
74-
+ [
75-
base_launch,
76-
]
77-
)
72+
return LaunchDescription(declared_arguments + [base_launch])

‎ur_bringup/launch/ur16e.launch.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,4 @@ def generate_launch_description():
6969
}.items(),
7070
)
7171

72-
return LaunchDescription(
73-
declared_arguments
74-
+ [
75-
base_launch,
76-
]
77-
)
72+
return LaunchDescription(declared_arguments + [base_launch])

0 commit comments

Comments
 (0)