From eac089f03899fc2387e0e69e62c41fc16bc171f8 Mon Sep 17 00:00:00 2001
From: Marco Randazzo <marco.randazzo@iit.it>
Date: Fri, 18 Aug 2023 15:47:20 +0200
Subject: [PATCH 1/2] added CI for yarp-ros version

---
 .github/workflows/conda-ci.yml | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/conda-ci.yml b/.github/workflows/conda-ci.yml
index d91066b..e37d1dc 100644
--- a/.github/workflows/conda-ci.yml
+++ b/.github/workflows/conda-ci.yml
@@ -85,8 +85,8 @@ jobs:
         cd ${GITHUB_WORKSPACE}
         git clone https://github.com/robotology/yarp
         #the next git switch command will be removed after the branch is merged into master
-        #cd yarp
-        #git switch origin/yarp_no_ros --detach
+        cd yarp
+        git switch origin/yarp_no_ros --detach
 
     - name: Configure and build yarp [Linux&macOS]
       if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
@@ -104,6 +104,27 @@ jobs:
         cmake --install . --config ${{ matrix.build_type }}
         echo "YARP_DATA_DIRS=${CONDA_PREFIX}/share/yarp::${YARP_DATA_DIRS}" >> $GITHUB_ENV
 
+    - name: Download Yarp-ros [Linux&macOS]
+      if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
+      run: |
+        cd ${GITHUB_WORKSPACE}
+        git clone https://github.com/robotology/yarp-ros
+
+    - name: Configure and build yarp-ros [Linux&macOS]
+      if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
+      shell: bash -l {0}
+      run: |
+        cd ${GITHUB_WORKSPACE}
+        cd yarp-ros
+        mkdir build
+        cd build
+        cmake -GNinja -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} \
+                      -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} .. \
+                      -DYARP_COMPILE_TESTS:BOOL=ON
+        cmake --build . --config ${{ matrix.build_type }}
+        cmake --install . --config ${{ matrix.build_type }}
+        echo "YARP_DATA_DIRS=${CONDA_PREFIX}/share/yarp::${YARP_DATA_DIRS}" >> $GITHUB_ENV
+
     - name: Configure yarp-devices-ros [Linux&macOS]
       if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')
       shell: bash -l {0}

From 907b855c3964aa9f5c6a7a6078955036b276fb61 Mon Sep 17 00:00:00 2001
From: Marco Randazzo <marco.randazzo@iit.it>
Date: Tue, 28 Nov 2023 14:17:31 +0100
Subject: [PATCH 2/2] Update conda-ci.yml

---
 .github/workflows/conda-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/conda-ci.yml b/.github/workflows/conda-ci.yml
index e37d1dc..219f35f 100644
--- a/.github/workflows/conda-ci.yml
+++ b/.github/workflows/conda-ci.yml
@@ -84,9 +84,6 @@ jobs:
       run: |
         cd ${GITHUB_WORKSPACE}
         git clone https://github.com/robotology/yarp
-        #the next git switch command will be removed after the branch is merged into master
-        cd yarp
-        git switch origin/yarp_no_ros --detach
 
     - name: Configure and build yarp [Linux&macOS]
       if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu')