Skip to content

Commit 0466e23

Browse files
Levi ArmstrongLevi-Armstrong
Levi Armstrong
authored and
Levi-Armstrong
committed
Update CI
1 parent 417f820 commit 0466e23

File tree

6 files changed

+17
-20
lines changed

6 files changed

+17
-20
lines changed

‎.github/workflows/bionic_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
ROS_DISTRO: melodic
2020
ROS_REPO: main
2121
UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
22-
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts iwyu fcl taskflow"
22+
ROSDEP_SKIP_KEYS: "bullet bullet-extras cmake_common_scripts iwyu fcl taskflow"
2323
DOCKER_IMAGE: "rosindustrial/tesseract:melodic"
2424
CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Bionic-Build/.ccache"
2525
PARALLEL_BUILDS: false

‎.github/workflows/focal_build.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- master
7-
- feature/CommandLanguage
87
pull_request:
98
schedule:
109
- cron: '0 5 * * *'
@@ -20,7 +19,7 @@ jobs:
2019
ROS_DISTRO: noetic
2120
ROS_REPO: main
2221
UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
23-
ROSDEP_SKIP_KEYS: "bullet3 fcl ompl orocos_kdl python-numpy ifopt python descartes_opw descartes_samplers descartes_light opw_kinematics cmake_common_scripts iwyu taskflow"
22+
ROSDEP_SKIP_KEYS: "bullet bullet-extras fcl ompl orocos_kdl python-numpy ifopt python descartes_opw descartes_samplers descartes_light opw_kinematics cmake_common_scripts iwyu taskflow"
2423
DOCKER_IMAGE: "rosindustrial/tesseract:noetic"
2524
CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Focal-Build/.ccache"
2625
PARALLEL_TESTS: false

‎.github/workflows/nightly.yml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,23 @@ jobs:
2020
OS_CODE_NAME: bionic,
2121
ROS_DISTRO: melodic,
2222
ROS_REPO: main,
23-
UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
24-
DOWNSTREAM_WORKSPACE: 'github:ros-industrial-consortium/tesseract_ros#feature/CommandLanguage',
25-
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts fcl iwyu",
23+
UPSTREAM_WORKSPACE: 'dependencies.rosinstall',
24+
ROSDEP_SKIP_KEYS: "bullet bullet-extras cmake_common_scripts fcl iwyu",
2625
DOCKER_IMAGE: "rosindustrial/tesseract:melodic",
2726
CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Bionic-Build-Nightly/.ccache",
2827
PARALLEL_TESTS: false,
2928
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release",
3029
TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release",
3130
DOWNSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release"}
32-
- {CI_NAME: Xenial-Build-Nightly,
31+
- {CI_NAME: Focal-Build-Nightly,
3332
OS_NAME: ubuntu,
34-
OS_CODE_NAME: xenial,
35-
ROS_DISTRO: kinetic,
33+
OS_CODE_NAME: focal,
34+
ROS_DISTRO: noetic,
3635
ROS_REPO: main,
37-
UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
38-
DOWNSTREAM_WORKSPACE: 'github:ros-industrial-consortium/tesseract_ros#feature/CommandLanguage',
39-
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts fcl iwyu benchmark",
40-
DOCKER_IMAGE: "rosindustrial/tesseract:kinetic",
41-
CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Xenial-Build-Nightly/.ccache",
36+
UPSTREAM_WORKSPACE: 'dependencies.rosinstall',
37+
ROSDEP_SKIP_KEYS: "bullet bullet-extras cmake_common_scripts fcl iwyu benchmark",
38+
DOCKER_IMAGE: "rosindustrial/tesseract:noetic",
39+
CCACHE_DIR: "/home/runner/work/tesseract_python/tesseract_python/Focal-Build-Nightly/.ccache",
4240
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release",
4341
TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release",
4442
DOWNSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release"}

‎.github/workflows/windows_noetic_build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- master
7-
- feature/CommandLanguage
87
pull_request:
98
schedule:
109
- cron: '0 5 * * *'
@@ -25,6 +24,7 @@ jobs:
2524
run: |
2625
choco sources add -n=roswin -s https://aka.ms/ros/public --priority 1
2726
choco install ros-%ROS_DISTRO%-desktop_full -y --no-progress
27+
choco install swig
2828
2929
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64
3030
call "C:\opt\ros\%ROS_DISTRO%\x64\setup.bat"
@@ -33,10 +33,10 @@ jobs:
3333
3434
rosdep update
3535
36-
vcs import --input "${{ github.workspace }}/src/tesseract_python/dependencies.rosinstall" src/
36+
vcs import --input "${{ github.workspace }}/src/tesseract_python/dependencies_with_ext.rosinstall" src/
3737
3838
rosdep install -q --from-paths . --ignore-src -y
3939
40-
catkin_make_isolated --install --force-cmake --only-pkg-with-deps tesseract_python --cmake-args -DCMAKE_BUILD_TYPE=Release -DINSTALL_OMPL=ON -DINSTALL_OMPL_TAG=master -DBUILD_IPOPT=OFF -DBUILD_SNOPT=OFF
40+
catkin_make_isolated --install --force-cmake --only-pkg-with-deps tesseract_python --cmake-args -DCMAKE_BUILD_TYPE=Release -DINSTALL_OMPL=ON -DINSTALL_OMPL_TAG=master -DBUILD_IPOPT=OFF -DBUILD_SNOPT=OFF -DINSTALL_FCL=ON -DINSTALL_BULLET=ON
4141
call "D:\a\tesseract_python\tesseract_python\install_isolated\setup.bat"
42-
catkin_make_isolated --install --force-cmake --pkg tesseract_python --cmake-args -DCMAKE_BUILD_TYPE=Release -DTESSERACT_ENABLE_TESTING=ON -DINSTALL_OMPL=ON -DINSTALL_OMPL_TAG=master -DBUILD_IPOPT=OFF -DBUILD_SNOPT=OFF
42+
catkin_make_isolated --install --force-cmake --pkg tesseract_python --cmake-args -DCMAKE_BUILD_TYPE=Release -DTESSERACT_ENABLE_TESTING=ON -DINSTALL_OMPL=ON -DINSTALL_OMPL_TAG=master -DBUILD_IPOPT=OFF -DBUILD_SNOPT=OFF -DINSTALL_FCL=ON -DINSTALL_BULLET=ON

‎dependencies.rosinstall‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
- git:
1414
local-name: trajopt
1515
uri: https://github.com/ros-industrial-consortium/trajopt_ros.git
16-
version: feature/CommandLanguage
16+
version: master
1717
- git:
1818
local-name: descartes_light
1919
uri: https://github.com/swri-robotics/descartes_light.git

‎dependencies_with_ext.rosinstall‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
- git:
1818
local-name: trajopt
1919
uri: https://github.com/ros-industrial-consortium/trajopt_ros.git
20-
version: feature/CommandLanguage
20+
version: master
2121
- git:
2222
local-name: descartes_light
2323
uri: https://github.com/swri-robotics/descartes_light.git

0 commit comments

Comments
 (0)