Skip to content

Commit

Permalink
Reintroduce ros-enabled (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
marip8 authored Jul 18, 2024
1 parent e4a5c0e commit 7b511b7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
## Usage

``` yaml
- uses: tesseract-robotics/colcon-action@v8
- uses: tesseract-robotics/colcon-action@v9
with:
# Script that runs before anything else in build steps (optional, default: '')
before-script: ''
Expand All @@ -17,6 +17,10 @@
rosdep-enabled: 'true'
# Additional args to pass to rosdep install (optional, default: '-r')
rosdep-install-args: '-r'
# Indicate if ROS PPA should be added (optional, default: 'false').
# The ROS PPA must be added if the Linux OS on which this action runs does not already contain a ROS distro.
# The ROS PPA should not be added if the Linux OS already contains a ROS distro (e.g., ROS Docker image)
add-ros-ppa: 'false'
# The relative path to the vcs repos file (optional, default: '')
vcs-file: 'dependencies.repos'
# Additional args to pass to colcon build for upstream workspace (optional, default: '')
Expand Down
6 changes: 5 additions & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ inputs:
description: "Additional args to pass to rosdep install (optional)"
required: false
default: '-r'
add-ros-ppa:
description: "Indicate if ROS PPA should be added (optional)"
required: false
default: 'true'
vcs-file:
description: "The relative path to the vcs repos file (optional)"
required: false
Expand Down Expand Up @@ -65,7 +69,7 @@ runs:
python3 -m pip install ninja -q
- name: Install ROS/Colcon PPA (Linux)
if: runner.os == 'Linux'
if: inputs.add-ros-ppa == 'true' && runner.os == 'Linux'
shell: bash
run: |
curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
Expand Down

0 comments on commit 7b511b7

Please sign in to comment.