diff --git a/action.yml b/action.yml index dcbf9f7..f3d4311 100644 --- a/action.yml +++ b/action.yml @@ -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: | diff --git a/build/action.yaml b/build/action.yaml index 4baa5d4..3ba19eb 100644 --- a/build/action.yaml +++ b/build/action.yaml @@ -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 diff --git a/setup/action.yaml b/setup/action.yaml index b734433..0228cf8 100644 --- a/setup/action.yaml +++ b/setup/action.yaml @@ -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 '.*'