File tree Expand file tree Collapse file tree 4 files changed +24
-11
lines changed Expand file tree Collapse file tree 4 files changed +24
-11
lines changed Original file line number Diff line number Diff line change 7
7
workflow_dispatch :
8
8
pull_request :
9
9
push :
10
+ branches :
11
+ - main
10
12
11
13
jobs :
12
14
pre-commit :
13
15
name : Format
14
- runs-on : ubuntu-latest
16
+ runs-on : ubuntu-20.04
15
17
steps :
16
- - uses : actions/checkout@v2
17
- - uses : actions/setup-python@v2
18
+ - uses : actions/checkout@v3
18
19
- name : Install clang-format-10
19
20
run : sudo apt-get install clang-format-10
20
21
- name : Install catkin-lint
28
29
rosdep update
29
30
sudo apt-get -q install catkin-lint
30
31
export ROS_DISTRO=noetic
31
- - uses : pre-commit/action@v2 .0.0
32
+ - uses : pre-commit/action@v3 .0.0
Original file line number Diff line number Diff line change @@ -31,19 +31,19 @@ jobs:
31
31
name : " ${{ matrix.env.ROS_DISTRO }} + ${{ matrix.env.ROS_REPO }}${{ matrix.env.CLANG_TIDY && ' + clang-tidy' || '' }}"
32
32
runs-on : ubuntu-latest
33
33
steps :
34
- - uses : actions/checkout@v2
34
+ - uses : actions/checkout@v3
35
35
# The target directory cache doesn't include the source directory because
36
36
# that comes from the checkout. See "prepare target_ws for cache" task below
37
37
- name : cache target_ws
38
38
if : ${{ ! matrix.env.CCOV }}
39
- uses : pat-s/always-upload-cache@v2.1.5
39
+ uses : pat-s/always-upload-cache@v3
40
40
with :
41
41
path : ${{ env.BASEDIR }}/target_ws
42
42
key : target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}-${{ github.run_id }}
43
43
restore-keys : |
44
44
target_ws-${{ env.CACHE_PREFIX }}-${{ hashFiles('**/CMakeLists.txt', '**/package.xml') }}
45
45
- name : cache ccache
46
- uses : pat-s/always-upload-cache@v2.1.5
46
+ uses : pat-s/always-upload-cache@v3
47
47
with :
48
48
path : ${{ env.CCACHE_DIR }}
49
49
key : ccache-${{ env.CACHE_PREFIX }}-${{ github.sha }}-${{ github.run_id }}
Original file line number Diff line number Diff line change 15
15
repos :
16
16
# Standard hooks
17
17
- repo : https://github.com/pre-commit/pre-commit-hooks
18
- rev : v3 .4.0
18
+ rev : v4 .4.0
19
19
hooks :
20
20
- id : check-added-large-files
21
21
- id : check-case-conflict
34
34
- id : trailing-whitespace
35
35
36
36
- repo : https://github.com/psf/black
37
- rev : 22 .3.0
37
+ rev : 23 .3.0
38
38
hooks :
39
39
- id : black
40
40
Original file line number Diff line number Diff line change @@ -1370,8 +1370,14 @@ bool MoveItVisualTools::publishTrajectoryLine(const moveit_msgs::RobotTrajectory
1370
1370
const moveit::core::JointModelGroup* arm_jmg,
1371
1371
const rviz_visual_tools::colors& color)
1372
1372
{
1373
+ if (!arm_jmg)
1374
+ {
1375
+ ROS_FATAL_STREAM_NAMED (LOGNAME, " arm_jmg is NULL" );
1376
+ return false ;
1377
+ }
1378
+
1373
1379
std::vector<const moveit::core::LinkModel*> tips;
1374
- if (!arm_jmg->getEndEffectorTips (tips))
1380
+ if (!arm_jmg->getEndEffectorTips (tips) || tips. empty () )
1375
1381
{
1376
1382
ROS_ERROR_STREAM_NAMED (LOGNAME, " Unable to get end effector tips from jmg" );
1377
1383
return false ;
@@ -1398,8 +1404,14 @@ bool MoveItVisualTools::publishTrajectoryLine(const robot_trajectory::RobotTraje
1398
1404
const moveit::core::JointModelGroup* arm_jmg,
1399
1405
const rviz_visual_tools::colors& color)
1400
1406
{
1407
+ if (!arm_jmg)
1408
+ {
1409
+ ROS_FATAL_STREAM_NAMED (LOGNAME, " arm_jmg is NULL" );
1410
+ return false ;
1411
+ }
1412
+
1401
1413
std::vector<const moveit::core::LinkModel*> tips;
1402
- if (!arm_jmg->getEndEffectorTips (tips))
1414
+ if (!arm_jmg->getEndEffectorTips (tips) || tips. empty () )
1403
1415
{
1404
1416
ROS_ERROR_STREAM_NAMED (LOGNAME, " Unable to get end effector tips from jmg" );
1405
1417
return false ;
You can’t perform that action at this time.
0 commit comments