From 75fd2be8345698cedb1f31286c6e0d6226906cb2 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Tue, 7 Apr 2020 11:36:44 -0700 Subject: [PATCH 1/9] Add GitHub workflow for Dashing (#96) * Add dashing workflow Using the ros-tooling custom GitHub actions Signed-off-by: Jacob Perron * Update repos file URL Signed-off-by: Jacob Perron --- .github/workflows/build_and_test.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/build_and_test.yml diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml new file mode 100644 index 00000000..19734367 --- /dev/null +++ b/.github/workflows/build_and_test.yml @@ -0,0 +1,20 @@ +name: CI + +on: [push] + +jobs: + build_and_test: + runs-on: ubuntu-18.04 + steps: + - name: Install Java + run: | + sudo apt update -qq + sudo apt install -y default-jdk + - uses: ros-tooling/setup-ros@0.0.14 + with: + required-ros-distributions: dashing + - uses: ros-tooling/action-ros-ci@8d58122 + 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 From 64954b49dc5dde2692ae22c4a7d437887cb6902a Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Wed, 12 Aug 2020 14:56:48 -0700 Subject: [PATCH 2/9] Update workflow file for Foxy Signed-off-by: Jacob Perron --- .github/workflows/build_and_test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 19734367..c61edfb6 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -4,7 +4,7 @@ on: [push] jobs: build_and_test: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Install Java run: | @@ -12,9 +12,9 @@ jobs: sudo apt install -y default-jdk - uses: ros-tooling/setup-ros@0.0.14 with: - required-ros-distributions: dashing + required-ros-distributions: foxy - uses: ros-tooling/action-ros-ci@8d58122 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 + source-ros-binary-installation: foxy + vcs-repo-file-url: ${{ github.workspace }}/ros2_java_desktop.repos From e2598ccca0b5d2df547353183d72708e20246d08 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Wed, 12 Aug 2020 14:57:27 -0700 Subject: [PATCH 3/9] Update desktop repos file for Foxy Signed-off-by: Jacob Perron --- ros2_java_desktop.repos | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ros2_java_desktop.repos b/ros2_java_desktop.repos index 2fc3529d..ee2792f4 100644 --- a/ros2_java_desktop.repos +++ b/ros2_java_desktop.repos @@ -6,23 +6,23 @@ repositories: ros2/common_interfaces: type: git url: https://github.com/ros2/common_interfaces - version: dashing + version: master ros2/rcl_interfaces: type: git url: https://github.com/ros2/rcl_interfaces.git - version: dashing + version: master ros2/rosidl_defaults: type: git url: https://github.com/ros2/rosidl_defaults - version: dashing + version: master ros2/unique_identifier_msgs: type: git url: https://github.com/ros2/unique_identifier_msgs - version: dashing + version: master ros2_java/ros2_java: type: git - url: https://github.com/ros2-java/ros2_java.git - version: dashing + url: https://github.com/osrf/ros2_java.git + version: foxy-devel ros2_java/ros2_java_examples: type: git url: https://github.com/ros2-java/ros2_java_examples.git From 30ba500ac9c2b59141fb7b9d72cdea71f7921c15 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Wed, 12 Aug 2020 15:46:56 -0700 Subject: [PATCH 4/9] Bump action ros-tooling action versions Signed-off-by: Jacob Perron --- .github/workflows/build_and_test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index c61edfb6..7876c4de 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -10,11 +10,11 @@ jobs: 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.25 with: required-ros-distributions: foxy - - uses: ros-tooling/action-ros-ci@8d58122 + - uses: ros-tooling/action-ros-ci@0.0.18 with: package-name: rosidl_generator_java rcljava_common rcljava - source-ros-binary-installation: foxy + target-ros2-distro: foxy vcs-repo-file-url: ${{ github.workspace }}/ros2_java_desktop.repos From 8cadcd427081f20c12d952c463988fa8dd035bda Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Wed, 12 Aug 2020 17:17:48 -0700 Subject: [PATCH 5/9] Try earlier 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 7876c4de..6186ae4d 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -13,8 +13,8 @@ jobs: - uses: ros-tooling/setup-ros@0.0.25 with: required-ros-distributions: foxy - - uses: ros-tooling/action-ros-ci@0.0.18 + - uses: ros-tooling/action-ros-ci@0.0.17 with: package-name: rosidl_generator_java rcljava_common rcljava - target-ros2-distro: foxy + source-ros-binary-installation: foxy vcs-repo-file-url: ${{ github.workspace }}/ros2_java_desktop.repos From bd759c399e6eed7e50782219c0fa50c77cc8e279 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Wed, 12 Aug 2020 19:08:41 -0700 Subject: [PATCH 6/9] Fix curl error 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 6186ae4d..5def49e4 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -17,4 +17,4 @@ jobs: with: package-name: rosidl_generator_java rcljava_common rcljava source-ros-binary-installation: foxy - vcs-repo-file-url: ${{ github.workspace }}/ros2_java_desktop.repos + vcs-repo-file-url: file:///${{ github.workspace }}/ros2_java_desktop.repos From 18079ce4491d8715e674bc0656cbda5903a46444 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Thu, 13 Aug 2020 09:21:52 -0700 Subject: [PATCH 7/9] Remove slash 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 5def49e4..b55cf4ce 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -17,4 +17,4 @@ jobs: with: package-name: rosidl_generator_java rcljava_common rcljava source-ros-binary-installation: foxy - vcs-repo-file-url: file:///${{ github.workspace }}/ros2_java_desktop.repos + vcs-repo-file-url: file://${{ github.workspace }}/ros2_java_desktop.repos From c021e5cd8c41930d6abdb0977c77bf45ba14ad75 Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Thu, 13 Aug 2020 09:44:48 -0700 Subject: [PATCH 8/9] Add checkout action Signed-off-by: Jacob Perron --- .github/workflows/build_and_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index b55cf4ce..8c99a95e 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -10,6 +10,7 @@ jobs: run: | sudo apt update -qq sudo apt install -y default-jdk + - uses: actions/checkout@v2 - uses: ros-tooling/setup-ros@0.0.25 with: required-ros-distributions: foxy From aeb2a65d57a6dd424fa89230760d92e089189bcb Mon Sep 17 00:00:00 2001 From: Jacob Perron Date: Thu, 13 Aug 2020 09:55:16 -0700 Subject: [PATCH 9/9] Switch to fork of ament_java Contains patch for Eloquent and Foxy. Signed-off-by: Jacob Perron --- ros2_java_desktop.repos | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ros2_java_desktop.repos b/ros2_java_desktop.repos index ee2792f4..3a79af5d 100644 --- a/ros2_java_desktop.repos +++ b/ros2_java_desktop.repos @@ -1,8 +1,8 @@ repositories: ament/ament_java: type: git - url: https://github.com/ros2-java/ament_java.git - version: master + url: https://github.com/jacobperron/ament_java.git + version: dsv_file_templates ros2/common_interfaces: type: git url: https://github.com/ros2/common_interfaces