From aa3d16b929ae6b667ccbdf413949f7bbdec2e6d0 Mon Sep 17 00:00:00 2001 From: gavanderhoorn Date: Wed, 29 Sep 2021 14:06:00 +0200 Subject: [PATCH 1/5] ci: remove Travis config --- .travis.yml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 85bf6b5e..00000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -language: generic -services: - - docker - -cache: - directories: - - $HOME/.ccache - -git: - quiet: true - -env: - global: - - CATKIN_LINT=true - - CCACHE_DIR=$HOME/.ccache - - ROS_REPO=ros - matrix: - - ROS_DISTRO="kinetic" - - ROS_DISTRO="kinetic" ROS_REPO=ros-shadow-fixed - - ROS_DISTRO="melodic" - - ROS_DISTRO="melodic" ROS_REPO=ros-shadow-fixed - -install: - - git clone --depth=1 -b master https://github.com/ros-industrial/industrial_ci.git .ci_config - -script: - - .ci_config/travis.sh From 34e7226bb2320dc33abf89465b98864cf742af9f Mon Sep 17 00:00:00 2001 From: gavanderhoorn Date: Wed, 29 Sep 2021 14:07:08 +0200 Subject: [PATCH 2/5] ci: initial GHA config --- .github/workflows/ci_bionic.yml | 48 +++++++++++++++++++++++++++++++ .github/workflows/ci_focal.yml | 50 +++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 .github/workflows/ci_bionic.yml create mode 100644 .github/workflows/ci_focal.yml diff --git a/.github/workflows/ci_bionic.yml b/.github/workflows/ci_bionic.yml new file mode 100644 index 00000000..a41c347f --- /dev/null +++ b/.github/workflows/ci_bionic.yml @@ -0,0 +1,48 @@ +name: CI - Ubuntu Bionic + +on: + # direct pushes to protected branches are not supported + pull_request: + # run every day, at 8am UTC + schedule: + - cron: '0 8 * * *' + # allow manually starting this workflow + workflow_dispatch: + +jobs: + industrial_ci: + name: ROS Melodic (${{ matrix.ros_repo }}) + runs-on: ubuntu-20.04 + + strategy: + fail-fast: false + matrix: + ros_distro: [ melodic ] + ros_repo: [ main, testing ] + + env: + CATKIN_LINT: true + CATKIN_LINT_ARGS: --ignore launch_depend --ignore unconfigured_build_depend + CCACHE_DIR: "${{ github.workspace }}/.ccache" + + steps: + - name: Fetch repository + uses: actions/checkout@v2 + + - name: ccache cache + uses: actions/cache@v2 + with: + path: ${{ env.CCACHE_DIR }} + # we always want the ccache cache to be persisted, as we cannot easily + # determine whether dependencies have changed, and ccache will manage + # updating the cache for us. Adding 'run_id' to the key will force an + # upload at the end of the job. + key: ccache-${{ matrix.ros_distro }}-${{ matrix.ros_repo }}-${{github.run_id}} + restore-keys: | + ccache-${{ matrix.ros_distro }}-${{ matrix.ros_repo }} + + - name: Run industrial_ci + uses: ros-industrial/industrial_ci@master + env: + ROS_DISTRO: ${{ matrix.ros_distro }} + ROS_REPO: ${{ matrix.ros_repo }} diff --git a/.github/workflows/ci_focal.yml b/.github/workflows/ci_focal.yml new file mode 100644 index 00000000..7eccadf8 --- /dev/null +++ b/.github/workflows/ci_focal.yml @@ -0,0 +1,50 @@ +name: CI - Ubuntu Focal + +on: + # direct pushes to protected branches are not supported + pull_request: + # run every day, at 8am UTC + schedule: + - cron: '0 8 * * *' + # allow manually starting this workflow + workflow_dispatch: + +jobs: + industrial_ci: + name: ROS Noetic (${{ matrix.ros_repo }}) + runs-on: ubuntu-20.04 + + strategy: + fail-fast: false + matrix: + ros_distro: [ noetic ] + ros_repo: [ main, testing ] + + env: + CATKIN_LINT: true + CATKIN_LINT_ARGS: --ignore launch_depend --ignore unconfigured_build_depend + CCACHE_DIR: "${{ github.workspace }}/.ccache" + # using abb_driver from source as it hasn't been released for Noetic + UPSTREAM_WORKSPACE: 'github:ros-industrial/abb_driver#melodic-devel' + + steps: + - name: Fetch repository + uses: actions/checkout@v2 + + - name: ccache cache + uses: actions/cache@v2 + with: + path: ${{ env.CCACHE_DIR }} + # we always want the ccache cache to be persisted, as we cannot easily + # determine whether dependencies have changed, and ccache will manage + # updating the cache for us. Adding 'run_id' to the key will force an + # upload at the end of the job. + key: ccache-${{ matrix.ros_distro }}-${{ matrix.ros_repo }}-${{github.run_id}} + restore-keys: | + ccache-${{ matrix.ros_distro }}-${{ matrix.ros_repo }} + + - name: Run industrial_ci + uses: ros-industrial/industrial_ci@master + env: + ROS_DISTRO: ${{ matrix.ros_distro }} + ROS_REPO: ${{ matrix.ros_repo }} From b70b255d1007540e2afb6859214a6da1eee555c8 Mon Sep 17 00:00:00 2001 From: gavanderhoorn Date: Wed, 29 Sep 2021 14:20:26 +0200 Subject: [PATCH 3/5] readme: there are no Kinetic dev builds any more --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 23e52966..57d5d929 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # ABB -[![Build Status](http://build.ros.org/job/Kdev__abb__ubuntu_xenial_amd64/badge/icon)](http://build.ros.org/job/Kdev__abb__ubuntu_xenial_amd64) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) From cb59e9f56dee8adbfe334d913d9c405d76cc3852 Mon Sep 17 00:00:00 2001 From: gavanderhoorn Date: Wed, 29 Sep 2021 14:20:38 +0200 Subject: [PATCH 4/5] readme: show GHA status badges --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 57d5d929..4e314908 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # ABB +[![Build Status: Ubuntu Bionic (Actions)](https://github.com/ros-industrial/abb/workflows/CI%20-%20Ubuntu%20Bionic/badge.svg?branch=kinetic-devel)](https://github.com/ros-industrial/abb/actions?query=workflow%3A%22CI+-+Ubuntu+Bionic%22) +[![Build Status: Ubuntu Focal (Actions)](https://github.com/ros-industrial/abb/workflows/CI%20-%20Ubuntu%20Focal/badge.svg?branch=kinetic-devel)](https://github.com/ros-industrial/abb/actions?query=workflow%3A%22CI+-+Ubuntu+Focal%22) + [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) From 50dccbe3e5884ac1e46ba00e2d79159a44d89490 Mon Sep 17 00:00:00 2001 From: gavanderhoorn Date: Wed, 29 Sep 2021 14:21:01 +0200 Subject: [PATCH 5/5] readme: switch to SVG support level badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e314908..0887fcec 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) -[![support level: community](https://img.shields.io/badge/support%20level-community-lightgray.png)](http://rosindustrial.org/news/2016/10/7/better-supporting-a-growing-ros-industrial-software-platform) +[![support level: community](https://img.shields.io/badge/support%20level-community-lightgray.svg)](http://rosindustrial.org/news/2016/10/7/better-supporting-a-growing-ros-industrial-software-platform) [ROS-Industrial][] ABB meta-package. See the [ROS wiki][] page for more information.