Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.

Commit 88e6492

Browse files
Emerson Knappemersonknapp
authored andcommitted
Fix CI by upgrading to action-ros-ci 0.1.0
Signed-off-by: Emerson Knapp <[email protected]>
1 parent 17e22a7 commit 88e6492

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

.github/workflows/build_and_test.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,14 @@ jobs:
2929
ROS_DISTRO: ${{ matrix.ros_distro }}
3030
ROS_VERSION: 1
3131
steps:
32-
# TODO(setup-ros-docker#7): calling chown is necessary for now
33-
- name: Run setup-ros-docker workaround
34-
run: sudo chown -R rosbuild:rosbuild "$HOME" .
3532
# Needed to access the vcs repos file from the workspace
3633
- name: Checkout source
3734
uses: actions/checkout@v2
3835
- name: Run action-ros-ci to build and test
39-
uses: ros-tooling/action-ros-ci@0.0.17
36+
uses: ros-tooling/action-ros-ci@0.1.0
4037
with:
41-
source-ros-binary-installation: ${{ matrix.ros_distro }}
38+
target-ros1-distro: ${{ env.ROS_VERSION == '1' && matrix.ros_distro || '' }}
39+
target-ros2-distro: ${{ env.ROS_VERSION == '2' && matrix.ros_distro || '' }}
4240
package-name: kinesis_video_streamer kinesis_video_msgs
4341
vcs-repo-file-url: ''
4442
- name: Upload resulting colcon logs

.github/workflows/build_and_test_release_latest.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,14 @@ jobs:
2525
ROS_DISTRO: ${{ matrix.ros_distro }}
2626
ROS_VERSION: 1
2727
steps:
28-
# TODO(setup-ros-docker#7): calling chown is necessary for now
29-
- name: Run setup-ros-docker workaround
30-
run: sudo chown -R rosbuild:rosbuild "$HOME" .
3128
# Needed to access the vcs repos file from the workspace
3229
- name: Checkout source
3330
uses: actions/checkout@v2
3431
- name: Run action-ros-ci to build and test
35-
uses: ros-tooling/action-ros-ci@0.0.17
32+
uses: ros-tooling/action-ros-ci@0.1.0
3633
with:
37-
source-ros-binary-installation: ${{ matrix.ros_distro }}
34+
target-ros1-distro: ${{ env.ROS_VERSION == '1' && matrix.ros_distro || '' }}
35+
target-ros2-distro: ${{ env.ROS_VERSION == '2' && matrix.ros_distro || '' }}
3836
package-name: kinesis_video_streamer kinesis_video_msgs
3937
# schedule runs against the default branch (master), so specify release-latest via repos file
4038
vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/release_latest.repos"

0 commit comments

Comments
 (0)