From 9dafd17efc8083d951ad340d7ce3e4983bda5b2d Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Tue, 23 Jun 2020 16:02:16 -0400 Subject: [PATCH 1/2] Fix Windows problem not finding ASIO. It basically needs an upgrade to setup-ros and action-ros-ci. Signed-off-by: Chris Lalancette --- .github/workflows/build_and_test.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 2ce91908..ecffc5ae 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,6 +1,6 @@ name: CI -on: [push] +on: [push, pull_request] jobs: linux_build_and_test: @@ -11,10 +11,10 @@ jobs: run: | sudo apt update -qq sudo apt install -y default-jdk - - uses: ros-tooling/setup-ros@3b3f060 + - uses: ros-tooling/setup-ros@b1c8132 with: required-ros-distributions: dashing - - uses: ros-tooling/action-ros-ci@242ffcc + - uses: ros-tooling/action-ros-ci@658ebdf with: package-name: rosidl_generator_java rcljava_common rcljava source-ros-binary-installation: dashing @@ -28,11 +28,12 @@ jobs: java-version: '11.0.6' # The JDK version to make available on the path. java-package: jdk architecture: x64 - - uses: ros-tooling/setup-ros@3b3f060 + - uses: ros-tooling/setup-ros@b1c8132 with: required-ros-distributions: dashing - - uses: ros-tooling/action-ros-ci@242ffcc + - uses: ros-tooling/action-ros-ci@658ebdf with: + colcon-extra-args: --merge-install package-name: rosidl_generator_java rcljava_common rcljava vcs-repo-file-url: | https://raw.githubusercontent.com/ros2/ros2/dashing/ros2.repos From 406844e9220cf25c1daa7a6b9b6971ef650778c7 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Mon, 29 Jun 2020 15:04:56 -0400 Subject: [PATCH 2/2] Fixes from review. Signed-off-by: Chris Lalancette --- .github/workflows/build_and_test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index ecffc5ae..91435487 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -11,7 +11,7 @@ jobs: run: | sudo apt update -qq sudo apt install -y default-jdk - - uses: ros-tooling/setup-ros@b1c8132 + - uses: ros-tooling/setup-ros@0.0.24 with: required-ros-distributions: dashing - uses: ros-tooling/action-ros-ci@658ebdf @@ -28,7 +28,7 @@ jobs: java-version: '11.0.6' # The JDK version to make available on the path. java-package: jdk architecture: x64 - - uses: ros-tooling/setup-ros@b1c8132 + - uses: ros-tooling/setup-ros@0.0.24 with: required-ros-distributions: dashing - uses: ros-tooling/action-ros-ci@658ebdf