Skip to content

Commit 9a89e0f

Browse files
authored
Merge PR #726: Fix CI
2 parents a3b53f5 + e0b8f3e commit 9a89e0f

41 files changed

Lines changed: 1126 additions & 381 deletions

Some content is hidden

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

.clang-format

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,75 @@
11
---
22
BasedOnStyle: Google
3+
ColumnLimit: 120
4+
MaxEmptyLinesToKeep: 1
5+
SortIncludes: false
6+
7+
Standard: Auto
8+
IndentWidth: 2
9+
TabWidth: 2
10+
UseTab: Never
311
AccessModifierOffset: -2
412
ConstructorInitializerIndentWidth: 2
13+
NamespaceIndentation: None
14+
ContinuationIndentWidth: 4
15+
IndentCaseLabels: true
16+
IndentFunctionDeclarationAfterType: false
17+
518
AlignEscapedNewlinesLeft: false
619
AlignTrailingComments: true
20+
721
AllowAllParametersOfDeclarationOnNextLine: false
22+
ExperimentalAutoDetectBinPacking: false
23+
ObjCSpaceBeforeProtocolList: true
24+
Cpp11BracedListStyle: false
25+
26+
AllowShortBlocksOnASingleLine: true
827
AllowShortIfStatementsOnASingleLine: false
928
AllowShortLoopsOnASingleLine: false
1029
AllowShortFunctionsOnASingleLine: None
11-
AllowShortLoopsOnASingleLine: false
30+
AllowShortCaseLabelsOnASingleLine: false
31+
1232
AlwaysBreakTemplateDeclarations: true
1333
AlwaysBreakBeforeMultilineStrings: false
1434
BreakBeforeBinaryOperators: false
1535
BreakBeforeTernaryOperators: false
1636
BreakConstructorInitializersBeforeComma: true
37+
1738
BinPackParameters: true
18-
ColumnLimit: 120
1939
ConstructorInitializerAllOnOneLineOrOnePerLine: true
2040
DerivePointerBinding: false
2141
PointerBindsToType: true
22-
ExperimentalAutoDetectBinPacking: false
23-
IndentCaseLabels: true
24-
MaxEmptyLinesToKeep: 1
25-
NamespaceIndentation: None
26-
ObjCSpaceBeforeProtocolList: true
27-
PenaltyBreakBeforeFirstCallParameter: 19
28-
PenaltyBreakComment: 60
29-
PenaltyBreakString: 1
30-
PenaltyBreakFirstLessLess: 1000
31-
PenaltyExcessCharacter: 1000
32-
PenaltyReturnTypeOnItsOwnLine: 90
42+
43+
PenaltyExcessCharacter: 50
44+
PenaltyBreakBeforeFirstCallParameter: 30
45+
PenaltyBreakComment: 1000
46+
PenaltyBreakFirstLessLess: 10
47+
PenaltyBreakString: 100
48+
PenaltyReturnTypeOnItsOwnLine: 50
49+
3350
SpacesBeforeTrailingComments: 2
34-
Cpp11BracedListStyle: false
35-
Standard: Auto
36-
IndentWidth: 2
37-
TabWidth: 2
38-
UseTab: Never
39-
IndentFunctionDeclarationAfterType: false
4051
SpacesInParentheses: false
4152
SpacesInAngles: false
4253
SpaceInEmptyParentheses: false
4354
SpacesInCStyleCastParentheses: false
55+
SpaceAfterCStyleCast: false
4456
SpaceAfterControlStatementKeyword: true
4557
SpaceBeforeAssignmentOperators: true
46-
ContinuationIndentWidth: 4
47-
SortIncludes: false
48-
SpaceAfterCStyleCast: false
4958

5059
# Configure each individual brace in BraceWrapping
5160
BreakBeforeBraces: Custom
5261

5362
# Control of individual brace wrapping cases
54-
BraceWrapping: {
55-
AfterClass: 'true'
56-
AfterControlStatement: 'true'
57-
AfterEnum : 'true'
58-
AfterFunction : 'true'
59-
AfterNamespace : 'true'
60-
AfterStruct : 'true'
61-
AfterUnion : 'true'
62-
BeforeCatch : 'true'
63-
BeforeElse : 'true'
64-
IndentBraces : 'false'
65-
}
63+
BraceWrapping:
64+
AfterCaseLabel: true
65+
AfterClass: true
66+
AfterControlStatement: true
67+
AfterEnum: true
68+
AfterFunction: true
69+
AfterNamespace: true
70+
AfterStruct: true
71+
AfterUnion: true
72+
BeforeCatch: true
73+
BeforeElse: true
74+
IndentBraces: false
6675
...

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
Overview of your issue here.
44

55
### Your environment
6-
* ROS Distro: [Indigo|Jade|Kinetic]
7-
* OS Version: e.g. Ubuntu 16.04
6+
* ROS Distro: [Kinetic|Melodic|Noetic]
7+
* OS Version: e.g. Ubuntu 18.04
88
* Source or Binary build?
99
* If binary, which release version?
1010
* If source, which git commit or tag?

.github/config.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44

55
# Comment to be posted to on first time issues
66
newIssueWelcomeComment: >
7-
Thanks for reporting an issue. We will have a look asap.
8-
If you can think of a fix, please consider providing it as a pull request.
7+
Thanks for reporting an issue. Because we're a volunteer community, providing a pull request with suggested changes is always welcomed.
98
109
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
1110

1211
# Comment to be posted to on PRs from first time contributors in your repository
1312
newPRWelcomeComment: >
14-
Thanks for helping in improving MoveIt!
13+
Thanks for helping in improving MoveIt and open source robotics!
1514
1615
# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
1716

1817
# Comment to be posted to on pull requests merged by a first time user
1918
firstPRMergeComment: >
20-
Congrats on getting your first MoveIt! pull request merged and improving open source robotics!
19+
Congrats on getting your first MoveIt pull request merged and improving open source robotics!
2120
2221
# It is recommended to include as many gifs and emojis as possible!

.github/workflows/ci.yaml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
2+
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)
3+
4+
name: CI
5+
6+
on:
7+
workflow_dispatch:
8+
pull_request:
9+
push:
10+
11+
jobs:
12+
ci:
13+
strategy:
14+
matrix:
15+
env:
16+
- IMAGE: melodic-source
17+
env:
18+
DOCKER_IMAGE: moveit/moveit:${{ matrix.env.IMAGE }}
19+
UNDERLAY: /root/ws_moveit/install
20+
CATKIN_LINT: true
21+
CCACHE_DIR: ${{ github.workspace }}/.ccache
22+
BASEDIR: ${{ github.workspace }}/.work
23+
CLANG_TIDY_BASE_REF: ${{ github.base_ref || github.ref }}
24+
25+
name: ${{ matrix.env.IMAGE }}${{ matrix.env.CATKIN_LINT && ' + catkin_lint' || ''}}${{ matrix.env.CLANG_TIDY && ' + clang-tidy' || '' }}
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@v2
29+
# The target directory cache doesn't include the source directory because
30+
# that comes from the checkout. See "prepare target_ws for cache" task below
31+
- name: cache target_ws
32+
uses: pat-s/always-upload-cache@v2.1.5
33+
with:
34+
path: ${{ env.BASEDIR }}/target_ws
35+
key: ${{ env.CACHE_PREFIX }}-${{ github.run_id }}
36+
restore-keys: ${{ env.CACHE_PREFIX }}
37+
env:
38+
CACHE_PREFIX: target_ws-${{ matrix.env.IMAGE }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}
39+
- name: cache ccache
40+
uses: pat-s/always-upload-cache@v2.1.5
41+
with:
42+
path: ${{ env.CCACHE_DIR }}
43+
key: ${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }}
44+
restore-keys: |
45+
${{ env.CACHE_PREFIX }}-${{ github.sha }}
46+
${{ env.CACHE_PREFIX }}
47+
env:
48+
CACHE_PREFIX: ccache-${{ matrix.env.IMAGE }}
49+
50+
- name: industrial_ci
51+
uses: ros-industrial/industrial_ci@master
52+
53+
- name: upload test artifacts (on failure)
54+
uses: actions/upload-artifact@v2
55+
if: failure()
56+
with:
57+
name: test-results
58+
path: ${{ env.BASEDIR }}/target_ws/**/test_results/**/*.xml
59+
- name: prepare target_ws for cache
60+
if: ${{ always() }}
61+
run: |
62+
du -sh ${{ env.BASEDIR }}/target_ws
63+
sudo find ${{ env.BASEDIR }}/target_ws -wholename '*/test_results/*' -delete
64+
sudo rm -rf ${{ env.BASEDIR }}/target_ws/src ${{ env.BASEDIR }}/target_ws/logs
65+
du -sh ${{ env.BASEDIR }}/target_ws
66+
67+
site:
68+
name: Build + Test Website
69+
runs-on: ubuntu-latest
70+
container: ros:melodic-ros-base
71+
steps:
72+
- uses: actions/checkout@v2
73+
- name: "Install ruby"
74+
run: |
75+
apt-get update -q
76+
apt-get install -q -y ruby-dev libffi-dev build-essential
77+
- name: "Run htmlproofer.sh"
78+
run: ./htmlproofer.sh

.github/workflows/format.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# This is a format job. Pre-commit has a first-party GitHub action, so we use
2+
# that: https://github.com/pre-commit/action
3+
4+
name: Format (pre-commit)
5+
6+
on:
7+
workflow_dispatch:
8+
pull_request:
9+
push:
10+
11+
jobs:
12+
pre-commit:
13+
name: pre-commit
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
- uses: actions/setup-python@v2
18+
- name: Install clang-format-10
19+
run: sudo apt-get install clang-format-10
20+
- uses: rhaschke/install-catkin_lint-action@v1.0
21+
with:
22+
distro: melodic
23+
- uses: pre-commit/action@v2.0.0

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ doc/manifest.yaml
44
doc/html
55
build
66
Gemfile
7-
native_build
7+
native_build

.pre-commit-config.yaml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# To use:
2+
#
3+
# pre-commit run -a
4+
#
5+
# Or:
6+
#
7+
# pre-commit install # (runs every time you commit in git)
8+
#
9+
# To update this file:
10+
#
11+
# pre-commit autoupdate
12+
#
13+
# See https://github.com/pre-commit/pre-commit
14+
15+
repos:
16+
# Standard hooks
17+
- repo: https://github.com/pre-commit/pre-commit-hooks
18+
rev: v4.3.0
19+
hooks:
20+
- id: check-added-large-files
21+
- id: check-case-conflict
22+
- id: check-json
23+
- id: check-merge-conflict
24+
- id: check-symlinks
25+
- id: check-toml
26+
- id: check-yaml
27+
- id: destroyed-symlinks
28+
- id: detect-private-key
29+
- id: end-of-file-fixer
30+
- id: mixed-line-ending
31+
- id: pretty-format-json
32+
- id: trailing-whitespace
33+
34+
- repo: local
35+
hooks:
36+
- id: clang-format
37+
name: clang-format
38+
description: Format files with ClangFormat.
39+
entry: clang-format-10
40+
language: system
41+
files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|proto|vert)$
42+
args: ['-fallback-style=none', '-i']
43+
- id: catkin_lint
44+
name: catkin_lint
45+
description: Check package.xml and cmake files
46+
entry: catkin_lint .
47+
language: system
48+
always_run: true
49+
pass_filenames: false
50+
- repo: https://github.com/codespell-project/codespell
51+
rev: v2.2.1
52+
hooks:
53+
- id: codespell
54+
args: ['--write-changes', '--ignore-words-list', 'debians,ro']
55+
exclude: _themes

.travis.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ This repository is currently built automatically by two systems. Travis builds t
1414

1515
## Versions
1616

17-
- ``indigo-devel`` usage is discouraged
18-
- ``kinetic-devel`` stable
19-
- ``melodic-devel`` latest, changes should target this branch
17+
- ``kinetic-devel`` usage is discouraged
18+
- ``melodic-devel`` stable
19+
- ``noetic-devel`` latest, changes should target this branch
2020

2121
## Build Locally
2222

2323
If you want to test the tutorials by generating the html pages locally on your machine, use the following helper script.
24-
It has been tested on Ubuntu 16.04 with ROS Kinetic pre-installed. Run in the root of the moveit_tutorials package:
24+
It has been tested on Ubuntu 18.04 with ROS Melodic pre-installed. Run in the root of the moveit_tutorials package:
2525

26-
source /opt/ros/kinetic/setup.bash
26+
source /opt/ros/melodic/setup.bash
2727
./build_locally.sh
2828

2929
The local website ``LOCAL_PACKAGE_PATH/build/html/index.html`` should automatically open in your web browser.

_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)