Skip to content

Commit a91c78a

Browse files
Update tesseract version to 0.32.X (#277)
1 parent 8cfbb14 commit a91c78a

File tree

6 files changed

+33
-30
lines changed

6 files changed

+33
-30
lines changed

.add-gazebo-ppa

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
2-
sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
3-
wget https://packages.osrfoundation.org/gazebo.key -O - | apt-key add -
4-
apt-get update
2+
apt update
3+
apt install curl python3-pip -y
4+
pip install cmake
5+
sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" > /etc/apt/sources.list.d/gazebo-stable.list'
6+
curl -fsSL https://packages.osrfoundation.org/gazebo.gpg | apt-key add -
7+
apt update

.github/workflows/clang_tidy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ jobs:
1515
env:
1616
CI_NAME: Clang-Tidy
1717
OS_NAME: ubuntu
18-
OS_CODE_NAME: bionic
18+
OS_CODE_NAME: focal
1919
ROS_DISTRO: noetic
2020
ROS_REPO: main
2121
BEFORE_INIT: './.add-gazebo-ppa'
2222
UPSTREAM_WORKSPACE: 'dependencies_unstable.rosinstall'
23-
ROSDEP_SKIP_KEYS: "bullet bullet-extras ros_industrial_cmake_boilerplate fcl iwyu taskflow gz-rendering7 gz-common5 gz-math7"
23+
ROSDEP_SKIP_KEYS: "gz-rendering7 gz-common5 gz-math7"
2424
ADDITIONAL_DEBS: "libgz-rendering7-dev libgz-common5-dev libgz-math7-dev"
25-
DOCKER_IMAGE: "rosindustrial/tesseract:noetic"
25+
DOCKER_IMAGE: "ros:noetic"
2626
CCACHE_DIR: "/home/runner/work/tesseract_ros/tesseract_ros/Clang-Tidy/.ccache"
2727
NOT_TEST_BUILD: true
28-
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug"
29-
TARGET_CMAKE_ARGS: "-DTESSERACT_ENABLE_CLANG_TIDY=ON -DTESSERACT_ENABLE_TESTING=ON"
28+
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
29+
TARGET_CMAKE_ARGS: "-DTESSERACT_ENABLE_CLANG_TIDY=ON -DTESSERACT_ENABLE_TESTING=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
3030
steps:
3131
- uses: actions/checkout@v1
3232

.github/workflows/focal_build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
ROS_REPO: main
2121
BEFORE_INIT: './.add-gazebo-ppa'
2222
UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
23-
ROSDEP_SKIP_KEYS: "bullet bullet-extras ros_industrial_cmake_boilerplate fcl iwyu taskflow gz-rendering7 gz-common5 gz-math7"
24-
ADDITIONAL_DEBS: "libgz-rendering7-dev libgz-common5-dev libgz-math7-dev"
25-
DOCKER_IMAGE: "rosindustrial/tesseract:noetic"
23+
ROSDEP_SKIP_KEYS: "gz-rendering7 gz-common5 gz-math7"
24+
ADDITIONAL_DEBS: "wget libgz-rendering7-dev libgz-common5-dev libgz-math7-dev"
25+
DOCKER_IMAGE: "ros:noetic"
2626
PARALLEL_TESTS: false
2727
NOT_TEST_BUILD: true
2828
BEFORE_RUN_TARGET_TEST_EMBED: "source /root/target_ws/install/setup.bash"
2929
CCACHE_DIR: "/home/runner/work/tesseract_ros/tesseract_ros/Focal-Build/.ccache"
30-
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release"
31-
TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug"
30+
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
31+
TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
3232
steps:
3333
- uses: actions/checkout@v1
3434

.github/workflows/unstable_build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
ROS_REPO: main
2121
BEFORE_INIT: './.add-gazebo-ppa'
2222
UPSTREAM_WORKSPACE: 'dependencies_unstable.rosinstall'
23-
ROSDEP_SKIP_KEYS: "bullet bullet-extras ros_industrial_cmake_boilerplate fcl iwyu taskflow gz-rendering7 gz-common5 gz-math7"
24-
ADDITIONAL_DEBS: "libgz-rendering7-dev libgz-common5-dev libgz-math7-dev"
25-
DOCKER_IMAGE: "rosindustrial/tesseract:noetic"
23+
ROSDEP_SKIP_KEYS: "gz-rendering7 gz-common5 gz-math7"
24+
ADDITIONAL_DEBS: "wget libgz-rendering7-dev libgz-common5-dev libgz-math7-dev"
25+
DOCKER_IMAGE: "ros:noetic"
2626
NOT_TEST_BUILD: true
2727
BEFORE_RUN_TARGET_TEST_EMBED: "source /root/target_ws/install/setup.bash"
2828
CCACHE_DIR: "/home/runner/work/tesseract_ros/tesseract_ros/Unstable-Build/.ccache"
29-
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release"
30-
TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON"
29+
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
30+
TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5"
3131
steps:
3232
- uses: actions/checkout@v1
3333

dependencies.rosinstall

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@
55
- git:
66
local-name: boost_plugin_loader
77
uri: https://github.com/tesseract-robotics/boost_plugin_loader.git
8-
version: 0.3.0
8+
version: 0.3.2
99
- git:
1010
local-name: tesseract
1111
uri: https://github.com/tesseract-robotics/tesseract.git
12-
version: 0.31.0
12+
version: 0.32.0
1313
- git:
1414
local-name: trajopt
1515
uri: https://github.com/tesseract-robotics/trajopt.git
16-
version: 0.31.0
16+
version: 0.32.0
1717
- git:
1818
local-name: tesseract_planning
1919
uri: https://github.com/tesseract-robotics/tesseract_planning.git
20-
version: 0.31.0
20+
version: 0.32.0
2121
- git:
2222
local-name: tesseract_qt
2323
uri: https://github.com/tesseract-robotics/tesseract_qt.git
24-
version: 0.31.0
24+
version: 0.32.0
2525
- git:
2626
local-name: descartes_light
2727
uri: https://github.com/swri-robotics/descartes_light.git
28-
version: 0.4.6
28+
version: 0.4.9
2929
- git:
3030
local-name: opw_kinematics
3131
uri: https://github.com/Jmeyer1292/opw_kinematics.git

dependencies_with_ext.rosinstall

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@
55
- git:
66
local-name: boost_plugin_loader
77
uri: https://github.com/tesseract-robotics/boost_plugin_loader.git
8-
version: 0.3.0
8+
version: 0.3.2
99
- git:
1010
local-name: tesseract_ext
1111
uri: https://github.com/tesseract-robotics/tesseract_ext.git
1212
version: master
1313
- git:
1414
local-name: tesseract
1515
uri: https://github.com/tesseract-robotics/tesseract.git
16-
version: 0.31.0
16+
version: 0.32.0
1717
- git:
1818
local-name: trajopt
1919
uri: https://github.com/tesseract-robotics/trajopt_ros.git
20-
version: 0.31.0
20+
version: 0.32.0
2121
- git:
2222
local-name: tesseract_planning
2323
uri: https://github.com/tesseract-robotics/tesseract_planning.git
24-
version: 0.31.0
24+
version: 0.32.0
2525
- git:
2626
local-name: tesseract_qt
2727
uri: https://github.com/tesseract-robotics/tesseract_qt.git
28-
version: 0.31.0
28+
version: 0.32.0
2929
- git:
3030
local-name: descartes_light
3131
uri: https://github.com/swri-robotics/descartes_light.git
32-
version: 0.4.6
32+
version: 0.4.9
3333
- git:
3434
local-name: opw_kinematics
3535
uri: https://github.com/Jmeyer1292/opw_kinematics.git

0 commit comments

Comments
 (0)