From 5f5a6786bbadfed232de0fd96f34d7dd2565e839 Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Tue, 22 Sep 2020 15:24:15 -0700 Subject: [PATCH 1/8] make gh actions on pair with ros2_controllers Signed-off-by: Karsten Knese --- .github/workflows/ci.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf47469c59..28a2430999 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,19 +9,7 @@ on: - cron: '17 8 * * *' jobs: - # ci_main_release: - # name: Industrial CI against release repository - # strategy: - # matrix: - # env: - # - {ROS_DISTRO: foxy, ROS_REPO: main} - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v1 - # - uses: 'ros-industrial/industrial_ci@master' - # env: ${{matrix.env}} - - ci_testing_release: + ci_binary: name: Industrial CI against testing repository strategy: matrix: @@ -43,7 +31,9 @@ jobs: - uses: ros-tooling/setup-ros@0.0.23 - uses: ros-tooling/action-ros-ci@0.0.17 with: - package-name: controller_interface controller_manager hardware_interface test_robot_hardware ros2_control + # build all packages listed in the meta package + package-name: + ros2_control vcs-repo-file-url: | https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_control/ros2_control.repos https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos @@ -55,7 +45,6 @@ jobs: file: ros_ws/lcov/total_coverage.info flags: unittests name: codecov-umbrella - yml: ./codecov.yml fail_ci_if_error: true - uses: actions/upload-artifact@v1 with: From bdc5d339a794ca4ae8b5f72bebb1bcd80fb17ec9 Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Tue, 22 Sep 2020 15:42:08 -0700 Subject: [PATCH 2/8] rename jobs Signed-off-by: Karsten Knese --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28a2430999..c01a2c362e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,12 +10,12 @@ on: jobs: ci_binary: - name: Industrial CI against testing repository + name: Binary job testing against latest release + runs-on: ubuntu-latest strategy: matrix: env: - {ROS_DISTRO: foxy, ROS_REPO: testing} - runs-on: ubuntu-latest steps: - run: sudo apt-get update -qq && sudo apt-get upgrade - uses: actions/checkout@v1 @@ -23,7 +23,7 @@ jobs: env: ${{matrix.env}} ci_source: - name: ros-tooling CI from source + name: Source job testing against latest ROS2 source branches runs-on: ubuntu-20.04 strategy: fail-fast: false From 3550616dfe81046e4e10ad1b6fcd84977bd85935 Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Tue, 22 Sep 2020 16:26:03 -0700 Subject: [PATCH 3/8] remove codecov Signed-off-by: Karsten Knese --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c01a2c362e..996d5fe669 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,13 +39,6 @@ jobs: https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos colcon-mixin-name: coverage-gcc colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml - - uses: codecov/codecov-action@v1 - with: - token: ${{ secrets.CODECOV_TOKEN }} - file: ros_ws/lcov/total_coverage.info - flags: unittests - name: codecov-umbrella - fail_ci_if_error: true - uses: actions/upload-artifact@v1 with: name: colcon-logs-${{ matrix.os }} From 0692906ff5b105f9c18894ee1a3472325d66fcd3 Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Wed, 23 Sep 2020 15:36:16 -0700 Subject: [PATCH 4/8] limit source job to foxy distribution Signed-off-by: Karsten Knese --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 996d5fe669..6c84ab7811 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,20 +23,22 @@ jobs: env: ${{matrix.env}} ci_source: - name: Source job testing against latest ROS2 source branches + name: Foxy source job runs-on: ubuntu-20.04 strategy: fail-fast: false steps: - uses: ros-tooling/setup-ros@0.0.23 + with: + required-ros-distributions: foxy - uses: ros-tooling/action-ros-ci@0.0.17 with: + source-ros-binary-installation: foxy # build all packages listed in the meta package package-name: ros2_control vcs-repo-file-url: | https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_control/ros2_control.repos - https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos colcon-mixin-name: coverage-gcc colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml - uses: actions/upload-artifact@v1 From 6502dc8a5886675665625f25356b62733d0ecb26 Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Wed, 23 Sep 2020 15:40:42 -0700 Subject: [PATCH 5/8] rename binary job Signed-off-by: Karsten Knese --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c84ab7811..65ae8dfb63 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: jobs: ci_binary: - name: Binary job testing against latest release + name: Foxy binary job runs-on: ubuntu-latest strategy: matrix: From 9d1830be2376670ce2113fbece78aba39a80336b Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Wed, 23 Sep 2020 15:50:59 -0700 Subject: [PATCH 6/8] list packages explicitly Signed-off-by: Karsten Knese --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65ae8dfb63..d8437c1f25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,6 +36,11 @@ jobs: source-ros-binary-installation: foxy # build all packages listed in the meta package package-name: + controller_interface + controller_manager + hardware_interface + test_robot_hardware + transmission_interface ros2_control vcs-repo-file-url: | https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ros2_control/ros2_control.repos From fd088ad649689544651d1ae165e0d91e07896ac3 Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Fri, 25 Sep 2020 11:20:05 -0700 Subject: [PATCH 7/8] add main repos Signed-off-by: Karsten Knese --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8437c1f25..a22bf56d56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,7 @@ jobs: matrix: env: - {ROS_DISTRO: foxy, ROS_REPO: testing} + - {ROS_DISTRO: foxy, ROS_REPO: main} steps: - run: sudo apt-get update -qq && sudo apt-get upgrade - uses: actions/checkout@v1 From 6e93527cc10a4862139662582dfadd9ad7d95147 Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Sat, 26 Sep 2020 10:28:34 -0700 Subject: [PATCH 8/8] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Denis Štogl --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a22bf56d56..19cd6057be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,8 @@ jobs: strategy: matrix: env: - - {ROS_DISTRO: foxy, ROS_REPO: testing} - {ROS_DISTRO: foxy, ROS_REPO: main} + - {ROS_DISTRO: foxy, ROS_REPO: testing} steps: - run: sudo apt-get update -qq && sudo apt-get upgrade - uses: actions/checkout@v1