From 4ac0536eff3bdf25352d244f6bab62b36c9ec43f Mon Sep 17 00:00:00 2001 From: Dan Rose Date: Thu, 9 Apr 2020 11:39:06 -0500 Subject: [PATCH] Change branching strategy (#142) * Change branching strategy - now `master` targets Foxy and `dashing-eloquent` targets Dashing and Eloquent fix https://github.com/ros2/rmw_cyclonedds/issues/128 --- .github/workflows/CI.yml | 9 +-------- README.md | 5 ++++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 675dcf4..b937554 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -5,15 +5,8 @@ jobs: strategy: fail-fast: false matrix: - rosdistro: [dashing, eloquent, master] + rosdistro: [master] os: [ubuntu-18.04, macOS-latest, windows-latest] - exclude: - # pending https://github.com/ament/ament_cmake/pull/233 - - rosdistro: eloquent - os: windows-latest - # pending https://github.com/ament/ament_cmake/pull/234 - - rosdistro: dashing - os: windows-latest runs-on: ${{ matrix.os }} steps: - if: runner.os == 'Linux' diff --git a/README.md b/README.md index 1879246..fec645e 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,10 @@ Cyclone DDS is ready to use. It seeks to give the fastest, easiest, and most rob ## Building from source and contributing -Note the `master` branch maintains compatibility with ROS releases Dashing and later, including the not-yet-released [*Foxy*](https://index.ros.org/doc/ros2/Releases/Release-Foxy-Fitzroy/). +The following branches are actively maintained: + +* `master`, which targets the upcoming ROS version, [*Foxy*](https://index.ros.org/doc/ros2/Releases/Release-Foxy-Fitzroy/). +* `dashing-eloquent`, which maintains compatibility with ROS releases [*Dashing*](https://index.ros.org/doc/ros2/Releases/Release-Dashing-Diademata/) and [*Eloquent*](https://index.ros.org/doc/ros2/Releases/Release-Eloquent-Elusor/) If building ROS2 from source ([ros2.repos](https://github.com/ros2/ros2/blob/master/ros2.repos)), you already have this package and Cyclone DDS: