From a57780741d9580d19f61ccc6942b93959648b739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Wed, 17 Jun 2020 14:23:10 +0200 Subject: [PATCH 01/17] Add notetic build --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 57c5dac..62ee009 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,11 @@ notifications: on_failure: always env: global: - - UPSTREAM_WORKSPACE=file + - UPSTREAM_WORKSPACE=" .travis.rosinstall" matrix: - ROS_DISTRO=kinetic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu - ROS_DISTRO=melodic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu + - ROS_DISTRO=noetic install: - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config script: From c7beaa641830cf252c53c24f8767d36763f057f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Wed, 17 Jun 2020 14:25:45 +0200 Subject: [PATCH 02/17] Update build status --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3092392..c76a436 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ iirob_filters ## ROS Distro Support -| | Kinetic | Melodic | -|:-------:|:-------:|:-------:| -| Branch | [`melodic`](https://github.com/KITrobotics/iirob_filters/tree/melodic) | [`melodic`](https://github.com/KITrobotics/iirob_filters/tree/melodic) | -| Status | [![Build Status](https://travis-ci.org/KITrobotics/iirob_filters.svg?branch=melodic)](https://travis-ci.org/KITrobotics/iirob_filters) | [![Build Status](https://travis-ci.org/KITrobotics/iirob_filters.svg?branch=kinetic-devel)](https://travis-ci.org/KITrobotics/iirob_filters) | -| Version | [version](http://repositories.ros.org/status_page/ros_kinetic_default.html?q=iirob_filters) | [version](http://repositories.ros.org/status_page/ros_melodic_default.html?q=iirob_filters) | +| | Kinetic | Melodic | Noetic | +|:-------:|:-------:|:-------:|:------:| +| Branch | [`melodic`](https://github.com/KITrobotics/iirob_filters/tree/melodic) | [`melodic`](https://github.com/KITrobotics/iirob_filters/tree/melodic) | [`melodic`](https://github.com/KITrobotics/iirob_filters/tree/melodic) | +| Status | [![Build Status](https://travis-ci.org/KITrobotics/iirob_filters.svg?branch=melodic)](https://travis-ci.org/KITrobotics/iirob_filters) | [![Build Status](https://travis-ci.org/KITrobotics/iirob_filters.svg?branch=kinetic-devel)](https://travis-ci.org/KITrobotics/iirob_filters) | [![Build Status](https://travis-ci.org/KITrobotics/iirob_filters.svg?branch=melodic)](https://travis-ci.org/KITrobotics/iirob_filters) | +| Version | [version](http://repositories.ros.org/status_page/ros_kinetic_default.html?q=iirob_filters) | [version](http://repositories.ros.org/status_page/ros_melodic_default.html?q=iirob_filters) | [version](http://repositories.ros.org/status_page/ros_noetic_default.html?q=iirob_filters) | From cf595f368e3db0af3ff5ec03d580fb4062a45482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Wed, 17 Jun 2020 15:35:23 +0200 Subject: [PATCH 03/17] Enable GitHub actions --- .github/workflows/ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..fdcbc68 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,17 @@ +name: CI + +on: [push, pull_request] + +jobs: + industrial_ci: + strategy: + matrix: + env: + - {ROS_DISTRO: melodic, ROS_REPO: main} + - {ROS_DISTRO: melodic, ROS_REPO: main} + - {ROS_DISTRO: noetic, ROS_REPO: main} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: 'ros-industrial/industrial_ci@master' + env: ${{matrix.env}} From 40c6a3f920c6b8545cce4f3c144fdcca17e007d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Wed, 17 Jun 2020 15:36:46 +0200 Subject: [PATCH 04/17] compile kinecit, melodic, noetic --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fdcbc68..0f35454 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,13 +1,13 @@ name: CI -on: [push, pull_request] +on: [pull_request] jobs: industrial_ci: strategy: matrix: env: - - {ROS_DISTRO: melodic, ROS_REPO: main} + - {ROS_DISTRO: kinetic, ROS_REPO: main} - {ROS_DISTRO: melodic, ROS_REPO: main} - {ROS_DISTRO: noetic, ROS_REPO: main} runs-on: ubuntu-latest From 0c81e114edd4967687dec5e3648e4f7a3ab39152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Wed, 17 Jun 2020 15:43:22 +0200 Subject: [PATCH 05/17] add rosparam_hanlder as dependency --- .travis.rosinstall | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.rosinstall b/.travis.rosinstall index 8b13789..daadaae 100644 --- a/.travis.rosinstall +++ b/.travis.rosinstall @@ -1 +1,4 @@ - +- git: + - uri: https://github.com/cbandera/rosparam_handler.git + - name: rosparam_handler + - version: develop From f55441e7d87ba72613dfa7516f5267a8d1b4f0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Wed, 17 Jun 2020 15:46:05 +0200 Subject: [PATCH 06/17] Update ci.yml --- .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 0f35454..08d6147 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: env: - {ROS_DISTRO: kinetic, ROS_REPO: main} - {ROS_DISTRO: melodic, ROS_REPO: main} - - {ROS_DISTRO: noetic, ROS_REPO: main} + - {ROS_DISTRO: noetic, ROS_REPO: main, ROSINSTALL_FILENAME: ".travis.rosinstall"} runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From 3c73f3decc9bdfb5141542c5af339bd3ae7e8fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Wed, 17 Jun 2020 15:50:09 +0200 Subject: [PATCH 07/17] Update ci.yml --- .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 08d6147..4ce1426 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: env: - {ROS_DISTRO: kinetic, ROS_REPO: main} - {ROS_DISTRO: melodic, ROS_REPO: main} - - {ROS_DISTRO: noetic, ROS_REPO: main, ROSINSTALL_FILENAME: ".travis.rosinstall"} + - {ROS_DISTRO: noetic, ROS_REPO: main, UPSTREAM_WORKSPACE: ".travis.rosinstall"} runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From f23b706f926253040a33563ed31e74e137d9817f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Wed, 17 Jun 2020 17:00:30 +0200 Subject: [PATCH 08/17] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62ee009..fa8fdc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,10 @@ notifications: on_failure: always env: global: - - UPSTREAM_WORKSPACE=" .travis.rosinstall" + - UPSTREAM_WORKSPACE=".travis.rosinstall" matrix: - - ROS_DISTRO=kinetic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu - - ROS_DISTRO=melodic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu + - ROS_DISTRO=kinetic + - ROS_DISTRO=melodic - ROS_DISTRO=noetic install: - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config From da4569e09fa2bbe7515899475010eaa19389c1ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Thu, 18 Jun 2020 16:48:56 +0200 Subject: [PATCH 09/17] Update rpos file structure --- .ci.repos | 5 +++++ .travis.rosinstall | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 .ci.repos delete mode 100644 .travis.rosinstall diff --git a/.ci.repos b/.ci.repos new file mode 100644 index 0000000..5de553b --- /dev/null +++ b/.ci.repos @@ -0,0 +1,5 @@ +repositories: + - rosparam_handler: + - tpye: git + - url: https://github.com/cbandera/rosparam_handler.git + - version: develop diff --git a/.travis.rosinstall b/.travis.rosinstall deleted file mode 100644 index daadaae..0000000 --- a/.travis.rosinstall +++ /dev/null @@ -1,4 +0,0 @@ -- git: - - uri: https://github.com/cbandera/rosparam_handler.git - - name: rosparam_handler - - version: develop From c0bd393a2c725ae533f1ffb06c7905f5bcf17203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Thu, 18 Jun 2020 16:49:24 +0200 Subject: [PATCH 10/17] repos file name changed --- .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 4ce1426..8a1db0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: env: - {ROS_DISTRO: kinetic, ROS_REPO: main} - {ROS_DISTRO: melodic, ROS_REPO: main} - - {ROS_DISTRO: noetic, ROS_REPO: main, UPSTREAM_WORKSPACE: ".travis.rosinstall"} + - {ROS_DISTRO: noetic, ROS_REPO: main, UPSTREAM_WORKSPACE: ".ci.repos"} runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From dc04cfc0eca384c8e9f49c9083c18b8a9c2badb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Thu, 18 Jun 2020 16:49:35 +0200 Subject: [PATCH 11/17] Delete .travis.yml --- .travis.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fa8fdc5..0000000 --- a/.travis.yml +++ /dev/null @@ -1,20 +0,0 @@ -sudo: required -dist: trusty -language: generic -compiler: - - gcc -notifications: - email: - on_success: change - on_failure: always -env: - global: - - UPSTREAM_WORKSPACE=".travis.rosinstall" - matrix: - - ROS_DISTRO=kinetic - - ROS_DISTRO=melodic - - ROS_DISTRO=noetic -install: - - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config -script: - - source .ci_config/travis.sh From 38c5321f410f31e02ea76ab0115691f30f6cbd3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Thu, 18 Jun 2020 17:02:39 +0200 Subject: [PATCH 12/17] Update .ci.repos --- .ci.repos | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.ci.repos b/.ci.repos index 5de553b..8b13789 100644 --- a/.ci.repos +++ b/.ci.repos @@ -1,5 +1 @@ -repositories: - - rosparam_handler: - - tpye: git - - url: https://github.com/cbandera/rosparam_handler.git - - version: develop + From bbe17de55f732917119afd138a0015f9114e5747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Thu, 18 Jun 2020 17:04:49 +0200 Subject: [PATCH 13/17] Update .ci.repos --- .ci.repos | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.ci.repos b/.ci.repos index 8b13789..5de553b 100644 --- a/.ci.repos +++ b/.ci.repos @@ -1 +1,5 @@ - +repositories: + - rosparam_handler: + - tpye: git + - url: https://github.com/cbandera/rosparam_handler.git + - version: develop From 21e562425509e336b18948c9163c15d0136fa3a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Thu, 18 Jun 2020 17:05:09 +0200 Subject: [PATCH 14/17] Update ci.yml --- .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 8a1db0e..0f35454 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: env: - {ROS_DISTRO: kinetic, ROS_REPO: main} - {ROS_DISTRO: melodic, ROS_REPO: main} - - {ROS_DISTRO: noetic, ROS_REPO: main, UPSTREAM_WORKSPACE: ".ci.repos"} + - {ROS_DISTRO: noetic, ROS_REPO: main} runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From e82036791debd7fdc2b583f9cbc37c513b76c0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Thu, 18 Jun 2020 17:08:05 +0200 Subject: [PATCH 15/17] Update ci.yml --- .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 0f35454..8a1db0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: env: - {ROS_DISTRO: kinetic, ROS_REPO: main} - {ROS_DISTRO: melodic, ROS_REPO: main} - - {ROS_DISTRO: noetic, ROS_REPO: main} + - {ROS_DISTRO: noetic, ROS_REPO: main, UPSTREAM_WORKSPACE: ".ci.repos"} runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From bf8b9b4d5cd505da3561b68d92b6fc3bef265769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Thu, 18 Jun 2020 17:17:00 +0200 Subject: [PATCH 16/17] Update .ci.repos --- .ci.repos | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci.repos b/.ci.repos index 5de553b..bdf3612 100644 --- a/.ci.repos +++ b/.ci.repos @@ -1,5 +1,5 @@ -repositories: - - rosparam_handler: - - tpye: git - - url: https://github.com/cbandera/rosparam_handler.git - - version: develop +- repositories: + - rosparam_handler: + - type: git + - url: https://github.com/cbandera/rosparam_handler.git + - version: develop From e734f027b6e4c9b7bc01bef96631cf62162a8275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20=C5=A0togl?= Date: Thu, 18 Jun 2020 17:20:19 +0200 Subject: [PATCH 17/17] Update .ci.repos --- .ci.repos | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci.repos b/.ci.repos index bdf3612..5c0a0b4 100644 --- a/.ci.repos +++ b/.ci.repos @@ -1,5 +1,5 @@ -- repositories: - - rosparam_handler: - - type: git - - url: https://github.com/cbandera/rosparam_handler.git - - version: develop +repositories: + rosparam_handler: + type: git + url: https://github.com/cbandera/rosparam_handler.git + version: develop