From 7701ed5ef3742efb921347ce92560ad778945646 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Fri, 1 May 2020 21:58:03 +0000 Subject: [PATCH 1/8] Add GitHub workflow for Windows CI Signed-off-by: Jacob Perron --- .github/workflows/build_and_test.yml | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 19734367..982618cb 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -3,18 +3,37 @@ name: CI on: [push] jobs: - build_and_test: + linux_build_and_test: runs-on: ubuntu-18.04 steps: + - uses: actions/checkout@v2 - name: Install Java run: | sudo apt update -qq sudo apt install -y default-jdk - - uses: ros-tooling/setup-ros@0.0.14 + - uses: ros-tooling/setup-ros@0.0.20 with: required-ros-distributions: dashing - - uses: ros-tooling/action-ros-ci@8d58122 + - uses: ros-tooling/action-ros-ci@e96382d with: package-name: rosidl_generator_java rcljava_common rcljava source-ros-binary-installation: dashing - vcs-repo-file-url: https://raw.githubusercontent.com/ros2-java/ros2_java/dashing/ros2_java_desktop.repos + vcs-repo-file-url: "${{ github.workspace }}/ros2_java_desktop.repos" + windows_build_and_test: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: '11.0.6' # The JDK version to make available on the path. + java-package: jdk + architecture: x64 + - uses: ros-tooling/setup-ros@0.0.20 + with: + required-ros-distributions: dashing + - uses: ros-tooling/action-ros-ci@e96382d + with: + package-name: rosidl_generator_java rcljava_common rcljava + vcs-repo-file-url: | + "https://raw.githubusercontent.com/ros2/ros2/dashing/ros2.repos" + "${{ github.workspace }}/ros2_java_desktop.repos" From b012698c5550b7f3a25ed6964f76a71900b1cc30 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Mon, 8 Jun 2020 12:11:27 -0700 Subject: [PATCH 2/8] Try bumping version of setup-ros action Signed-off-by: Jacob Perron --- .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 982618cb..1400eacc 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@0.0.20 + - uses: ros-tooling/setup-ros@3b3f060 with: required-ros-distributions: dashing - uses: ros-tooling/action-ros-ci@e96382d @@ -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@0.0.20 + - uses: ros-tooling/setup-ros@3b3f060 with: required-ros-distributions: dashing - uses: ros-tooling/action-ros-ci@e96382d From fa60dbaff947aa1c4927dff516cfa5dc1088fd7e Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Mon, 8 Jun 2020 12:30:49 -0700 Subject: [PATCH 3/8] Try bumping version of action-ros-ci Signed-off-by: Jacob Perron --- .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 1400eacc..55cf738e 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -14,7 +14,7 @@ jobs: - uses: ros-tooling/setup-ros@3b3f060 with: required-ros-distributions: dashing - - uses: ros-tooling/action-ros-ci@e96382d + - uses: ros-tooling/action-ros-ci@242ffcc with: package-name: rosidl_generator_java rcljava_common rcljava source-ros-binary-installation: dashing @@ -31,7 +31,7 @@ jobs: - uses: ros-tooling/setup-ros@3b3f060 with: required-ros-distributions: dashing - - uses: ros-tooling/action-ros-ci@e96382d + - uses: ros-tooling/action-ros-ci@242ffcc with: package-name: rosidl_generator_java rcljava_common rcljava vcs-repo-file-url: | From 4f842ed6d4c1ce4111fc4bf90ddb17405b287d42 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Mon, 8 Jun 2020 12:48:08 -0700 Subject: [PATCH 4/8] Remove quotation marks from repo file Signed-off-by: Jacob Perron --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 55cf738e..4fc64f07 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -35,5 +35,5 @@ jobs: with: package-name: rosidl_generator_java rcljava_common rcljava vcs-repo-file-url: | - "https://raw.githubusercontent.com/ros2/ros2/dashing/ros2.repos" + https://raw.githubusercontent.com/ros2/ros2/dashing/ros2.repos "${{ github.workspace }}/ros2_java_desktop.repos" From 56640df5653bb11254d4aab009e4e43ed37a9e6e Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Mon, 8 Jun 2020 12:50:51 -0700 Subject: [PATCH 5/8] Enable linters explicitly instead of using ament_lint_common This gives more control over which linters are run. For example, we don't need to depend on Python linters for many packages. This commit also worksaround an upstream issue with CI, where ament_cmake_flake8 is currently failing with a Dashing installation if flake8 is installed from pip. See https://github.com/ament/ament_lint/pull/252 for a fix upstream. Signed-off-by: Jacob Perron --- ament_cmake_export_jars/package.xml | 4 +++- ament_cmake_export_jni_libraries/package.xml | 4 +++- rcljava/package.xml | 6 +++++- rcljava_common/package.xml | 6 +++++- rosidl_generator_java/package.xml | 9 ++++++++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ament_cmake_export_jars/package.xml b/ament_cmake_export_jars/package.xml index 97030832..925256a2 100644 --- a/ament_cmake_export_jars/package.xml +++ b/ament_cmake_export_jars/package.xml @@ -18,8 +18,10 @@ ament_java_resources ament_java_resources + ament_cmake_copyright + ament_cmake_lint_cmake + ament_cmake_xmllint ament_lint_auto - ament_lint_common ament_cmake diff --git a/ament_cmake_export_jni_libraries/package.xml b/ament_cmake_export_jni_libraries/package.xml index 5c6c8a6a..58df81c0 100644 --- a/ament_cmake_export_jni_libraries/package.xml +++ b/ament_cmake_export_jni_libraries/package.xml @@ -18,8 +18,10 @@ ament_java_resources ament_java_resources + ament_cmake_copyright + ament_cmake_lint_cmake + ament_cmake_xmllint ament_lint_auto - ament_lint_common ament_cmake diff --git a/rcljava/package.xml b/rcljava/package.xml index 90da562f..433a9d6b 100644 --- a/rcljava/package.xml +++ b/rcljava/package.xml @@ -34,8 +34,12 @@ rosidl_generator_c rosidl_parser + ament_cmake_copyright + ament_cmake_cppcheck + ament_cmake_lint_cmake + ament_cmake_uncrustify + ament_cmake_xmllint ament_lint_auto - ament_lint_common builtin_interfaces rcl_interfaces rcljava_common diff --git a/rcljava_common/package.xml b/rcljava_common/package.xml index 649b90cc..d388c3d8 100644 --- a/rcljava_common/package.xml +++ b/rcljava_common/package.xml @@ -12,8 +12,12 @@ ament_cmake_export_libraries rosidl_cmake + ament_cmake_copyright + ament_cmake_cppcheck + ament_cmake_lint_cmake + ament_cmake_uncrustify + ament_cmake_xmllint ament_lint_auto - ament_lint_common ament_cmake diff --git a/rosidl_generator_java/package.xml b/rosidl_generator_java/package.xml index deffa059..9924c76a 100644 --- a/rosidl_generator_java/package.xml +++ b/rosidl_generator_java/package.xml @@ -27,9 +27,16 @@ rosidl_generator_c rosidl_parser + ament_cmake_copyright + ament_cmake_cppcheck + + ament_cmake_gtest + ament_cmake_lint_cmake + ament_cmake_pep257 + ament_cmake_uncrustify + ament_cmake_xmllint ament_lint_auto - ament_lint_common rmw_implementation rmw_implementation_cmake From e6495c72528aa0135955933895e955fb283fd633 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Mon, 8 Jun 2020 13:46:28 -0700 Subject: [PATCH 6/8] Fix file path separator for Windows Signed-off-by: Jacob Perron --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 4fc64f07..47299e50 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -36,4 +36,4 @@ jobs: package-name: rosidl_generator_java rcljava_common rcljava vcs-repo-file-url: | https://raw.githubusercontent.com/ros2/ros2/dashing/ros2.repos - "${{ github.workspace }}/ros2_java_desktop.repos" + "${{ github.workspace }}\ros2_java_desktop.repos" From 257c376f396410a56d78da057c3d3a6a39d78343 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Tue, 9 Jun 2020 16:12:21 -0700 Subject: [PATCH 7/8] Remove quotation marks Signed-off-by: Jacob Perron --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 47299e50..2ce91908 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -36,4 +36,4 @@ jobs: package-name: rosidl_generator_java rcljava_common rcljava vcs-repo-file-url: | https://raw.githubusercontent.com/ros2/ros2/dashing/ros2.repos - "${{ github.workspace }}\ros2_java_desktop.repos" + ${{ github.workspace }}\ros2_java_desktop.repos From b4fd7e510f4b54e4202c68cbb9fc9ffe8f7cdbed Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Mon, 29 Jun 2020 16:26:14 -0400 Subject: [PATCH 8/8] 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 * Fixes from review. 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..91435487 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@0.0.24 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@0.0.24 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