update

mROS-base · Sep 24, 2024 · 870813b · 870813b
1 parent 111b8fe
commit 870813b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/.github/workflows/ci_humble_string.yaml b/.github/workflows/ci_humble_string.yaml
@@ -54,14 +54,28 @@ jobs:
           cd ws_host/
           source /opt/ros/humble/setup.bash
           colcon build --packages-select mros2_echoreply_string
-      - name: Run mROS
+      - name: Run mROS and Native ROS
         shell: bash
         run : |
-          ./cmake_build/mros2-posix &
-      - name: Run Native ROS
-        shell: bash
-        run : |
-          cd ws_host/
-          source /opt/ros/humble/setup.bash
-          source install/setup.bash
-          ros2 run mros2_echoreply_string echoreply_node
+            ./cmake_build/mros2-posix &
+            mros_pid=$!  # mROSのプロセスIDを取得
+
+            # Native ROSをバックグラウンドで実行
+            cd ws_host/
+            source /opt/ros/humble/setup.bash
+            source install/setup.bash
+            ros2 run mros2_echoreply_string echoreply_node &
+            native_ros_pid=$!  # Native ROSのプロセスIDを取得
+
+            # mROSが終了するまで待つ
+            wait $mros_pid
+            mros_status=$?
+
+            # 結果に基づいてCIの成否を判断
+            if [ $mros_status -eq 0 ] ;then
+              echo "Both mROS and Native ROS completed successfully."
+              exit 0
+            else
+              echo "One or both processes failed."
+              exit 1
+            fi
diff --git a/...ace/test_echoreply_string/Filelists.cmake → ...pace/test_echoback_string/Filelists.cmake b/...ace/test_echoreply_string/Filelists.cmake → ...pace/test_echoback_string/Filelists.cmake
diff --git a/workspace/test_echoreply_string/app.cpp → workspace/test_echoback_string/app.cpp b/workspace/test_echoreply_string/app.cpp → workspace/test_echoback_string/app.cpp
diff --git a/...space/test_echoreply_string/templates.hpp → workspace/test_echoback_string/templates.hpp b/...space/test_echoreply_string/templates.hpp → workspace/test_echoback_string/templates.hpp