Skip to content

Commit

Permalink
feat: initialize workspace setup script after workspace setup (#40)
Browse files Browse the repository at this point in the history
* feat(setup): initialize workspace build after setup

* feat(build): source the local setup script instead

* feat(build): remove unused `ros2-distro` input
  • Loading branch information
threeal authored Nov 3, 2023
1 parent 6baa0bd commit 2ab635c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
6 changes: 2 additions & 4 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ inputs:
runs:
using: composite
steps:
- uses: ichiro-its/ros2-build-and-test-action/setup@dfe0ad86dc3adcc73f9314c8ab4d585263caa7f0
- uses: ichiro-its/ros2-build-and-test-action/setup@d80e4254f5c4722b0dcea1b73b83d434a2db069c
with:
ros2-distro: ${{ inputs.ros2-distro }}

- uses: ichiro-its/ros2-build-and-test-action/build@83681337c83fd88d63d1826964a55edbaf56ea2f
with:
ros2-distro: ${{ inputs.ros2-distro }}
- uses: ichiro-its/ros2-build-and-test-action/build@d80e4254f5c4722b0dcea1b73b83d434a2db069c

- shell: bash
run: |
Expand Down
7 changes: 1 addition & 6 deletions build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,10 @@ author: ICHIRO ITS
branding:
icon: activity
color: gray-dark
inputs:
ros2-distro:
description: The ROS 2 distribution to be used.
required: false
default: iron
runs:
using: composite
steps:
- shell: bash
run: |
source /opt/ros/${{ inputs.ros2-distro }}/setup.bash
source install/setup.bash
colcon build --event-handlers console_cohesion+ --cmake-args
5 changes: 5 additions & 0 deletions setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,8 @@ runs:
sudo rosdep init
rosdep update
rosdep install -y --rosdistro ${{ inputs.ros2-distro }} --from-paths .
- shell: bash
run: |
source /opt/ros/${{ inputs.ros2-distro }}/setup.bash
colcon build --packages-skip-regex '.*'

0 comments on commit 2ab635c

Please sign in to comment.