Skip to content

Switch CI to use ros-industrial master #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Levi-Armstrong merged 2 commits into from
Jul 27, 2020
Merged

Switch CI to use ros-industrial master #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80affcc
Switch CI to use ros-industrial master
mpowelson Jun 8, 2020
78c740f
Add cmake_common_scripts to the rosinstall
mpowelson Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,28 @@ jobs:
OS_CODE_NAME: bionic,
ROS_DISTRO: eloquent,
ROS_REPO: main,
ROSDEP_SKIP_KEYS: "bullet3 fcl ompl",
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts fcl iwyu ompl",
CLANG_FORMAT_CHECK: file,
CLANG_FORMAT_VERSION: 8,
DOCKER_IMAGE: "mpowelson/tesseract:eloquent",
AFTER_INIT: "apt-get upgrade -y",
BADGE: clang-format}
- {OS_NAME: ubuntu,
OS_CODE_NAME: bionic,
ROS_DISTRO: eloquent,
ROS_REPO: main,
UPSTREAM_WORKSPACE: 'dependencies.rosinstall',
Copy link
Copy Markdown

@mathias-luedtke mathias-luedtke Jun 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
UPSTREAM_WORKSPACE: 'dependencies.rosinstall',
TARGET_WORKSPACE: '. dependencies.rosinstall',

The dot means target repository.

Copy link
Copy Markdown

@mathias-luedtke mathias-luedtke Jun 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this puts all packages into the targer workspace, but it will build and run all tests as well.

ROSDEP_SKIP_KEYS: "bullet3 fcl ompl",
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts fcl iwyu ompl",
DOCKER_IMAGE: "mpowelson/tesseract:eloquent",
Comment thread
mpowelson marked this conversation as resolved.
AFTER_INIT: "apt-get upgrade -y",
BADGE: clang-tidy,
NOT_TEST_BUILD: true,
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug",
TARGET_CMAKE_ARGS: "-DTESSERACT_ENABLE_CLANG_TIDY=ON -DTESSERACT_ENABLE_TESTING=ON"}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: 'ipa-mdl/industrial_ci@revert-revert-colcon-chain'
- uses: 'ros-industrial/industrial_ci@master'
env: ${{matrix.env}}
test:
strategy:
Expand All @@ -47,13 +49,14 @@ jobs:
ROS_DISTRO: eloquent,
ROS_REPO: main,
UPSTREAM_WORKSPACE: 'dependencies.rosinstall',
ROSDEP_SKIP_KEYS: "bullet3 fcl ompl",
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts fcl iwyu ompl",
DOCKER_IMAGE: "mpowelson/tesseract:eloquent",
Comment thread
mpowelson marked this conversation as resolved.
AFTER_INIT: "apt-get upgrade -y",
BADGE: bionic,
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug",
TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DTESSERACT_ENABLE_TESTING=ON"}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: 'ipa-mdl/industrial_ci@revert-revert-colcon-chain'
- uses: 'ros-industrial/industrial_ci@master'
env: ${{matrix.env}}
4 changes: 4 additions & 0 deletions dependencies.rosinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
- git:
local-name: cmake_common_scripts
uri: https://github.com/ros-industrial/cmake_common_scripts.git
version: master
- git:
local-name: tesseract
uri: https://github.com/ros-industrial-consortium/tesseract.git
Expand Down