From 7cc84a11e339b13084ab98de0410f3ae65c26a78 Mon Sep 17 00:00:00 2001 From: Thibault Poignonec <79221188+tpoignonec@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:42:29 +0200 Subject: [PATCH] Update CI before humble / jazzy branches creation (#18) * CI only for humble to prepare humble branch * weekly CI runs * change CI file type to .yml * update README --- .github/workflows/ci-iron.yaml | 21 ------- .github/workflows/ci.yaml | 60 ------------------- .github/workflows/{ci-rolling.yaml => ci.yml} | 6 +- README.md | 8 ++- 4 files changed, 9 insertions(+), 86 deletions(-) delete mode 100644 .github/workflows/ci-iron.yaml delete mode 100644 .github/workflows/ci.yaml rename .github/workflows/{ci-rolling.yaml => ci.yml} (84%) diff --git a/.github/workflows/ci-iron.yaml b/.github/workflows/ci-iron.yaml deleted file mode 100644 index 261eb24..0000000 --- a/.github/workflows/ci-iron.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: CI (iron) -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - workflow_dispatch: -jobs: - build: - runs-on: ubuntu-latest - container: - image: ubuntu:jammy - steps: - - uses: actions/checkout@v4 - - uses: ros-tooling/setup-ros@v0.7 - with: - use-ros2-testing: true - - uses: ros-tooling/action-ros-ci@v0.3 - with: - target-ros2-distro: iron - vcs-repo-file-url: ./forcedimension_ros2.repos diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml deleted file mode 100644 index d165f73..0000000 --- a/.github/workflows/ci.yaml +++ /dev/null @@ -1,60 +0,0 @@ -name: CI (humble) - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] -jobs: - CI: - runs-on: ubuntu-latest - steps: - - name: Prepare - run: | - mkdir -p ${{github.workspace}}/src - - uses: actions/checkout@v2 - with: - path: src/forcedimension_ros2 - - - name: Build - uses: addnab/docker-run-action@v3 - with: - image: ros:humble - options: -v ${{github.workspace}}/:/ros/ - run: | - apt update - cd /ros/src/ - vcs import . < forcedimension_ros2/forcedimension_ros2.repos - cd /ros - . /opt/ros/humble/setup.sh - rosdep install --ignore-src --from-paths . -y -r && \ - colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --symlink-install - - - name: Tests - uses: addnab/docker-run-action@v3 - with: - image: ros:humble - options: -v ${{github.workspace}}/:/ros/ - run: | - apt update - cd /ros/src/ - vcs import . < forcedimension_ros2/forcedimension_ros2.repos - cd /ros - . /opt/ros/humble/setup.sh - rosdep install --ignore-src --from-paths . -y -r && \ - colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --symlink-install - colcon test - colcon test-result - - - name: Upload Tests to Artifacts - uses: actions/upload-artifact@v3 - if: always() - with: - name: test-results - path: build/*/test_results/*/*.xml - - - name: Publish Unit Test Results - uses: EnricoMi/publish-unit-test-result-action@v2 - if: always() - with: - files: build/*/test_results/*/*.xml diff --git a/.github/workflows/ci-rolling.yaml b/.github/workflows/ci.yml similarity index 84% rename from .github/workflows/ci-rolling.yaml rename to .github/workflows/ci.yml index ffaf51b..66d539d 100644 --- a/.github/workflows/ci-rolling.yaml +++ b/.github/workflows/ci.yml @@ -1,10 +1,12 @@ -name: CI (rolling) +name: CI (humble) on: push: branches: [ main ] pull_request: branches: [ main ] workflow_dispatch: + schedule: + - cron: '0 0 * * 0' jobs: build: runs-on: ubuntu-latest @@ -21,5 +23,5 @@ jobs: pwd - uses: ros-tooling/action-ros-ci@v0.3 with: - target-ros2-distro: rolling + target-ros2-distro: humble vcs-repo-file-url: ./forcedimension_ros2.repos diff --git a/README.md b/README.md index 068ce96..2e90264 100644 --- a/README.md +++ b/README.md @@ -5,15 +5,17 @@ This stack includes `ros2_control` drivers for Force Dimension SDK compatible ha ***Tested with a Humble ROS distribution only (Ubuntu 22.04 LTS)*** [![Licence](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) -[![CI (humble)](../../actions/workflows/ci.yaml/badge.svg)](../../actions/workflows/ci.yaml) -[![Build tests (iron)](../../actions/workflows/ci-iron.yaml/badge.svg?branch=main)](../../actions/workflows/ci-iron.yaml?query=branch:main) -[![Build tests (rolling)](../../actions/workflows/ci-rolling.yaml/badge.svg?branch=main)](../../actions/workflows/ci-rolling.yaml?query=branch:main) +[![CI (humble)](../../actions/workflows/ci.yml/badge.svg?branch=humble)](../../actions/workflows/ci.yml?query=branch:humble) > **Warning** > > The vendor package [fd_sdk_vendor](https://github.com/ICube-Robotics/fd_sdk_vendor.git) is now required! > Please follow the installation steps carefully. +> **Note** +> +> Although still online, the `foxy` and `galactic` branches are not maintained anymore and might be obsolete. + ## Compatible devices The driver was currently tested on the following haptic devices: