From 54688ad04af340ae2621f259ea459aff3403cf37 Mon Sep 17 00:00:00 2001
From: MrBearing <takumi1988okamoto@gmail.com>
Date: Sun, 29 Sep 2024 12:41:23 +0900
Subject: [PATCH] temp update

---
 .github/workflows/humble_docker_test.yaml | 10 ++--------
 .github/workflows/humble_test.yaml        | 19 +++++++------------
 README.md                                 |  2 +-
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/humble_docker_test.yaml b/.github/workflows/humble_docker_test.yaml
index fb6b26b..64c187d 100644
--- a/.github/workflows/humble_docker_test.yaml
+++ b/.github/workflows/humble_docker_test.yaml
@@ -1,25 +1,19 @@
-name: Humble_test_with_docker_NativeROS_string
+name: buid_and_test_with_docker_NativeROS_string
 
 on:
   push:
     branches:
       - "main"
   pull_request:
-    types: [opened, synchronize, labeled]
+    types: [opened, synchronize]
 jobs:
   ci:
-    runs-on: ${{ matrix.os }}
-    if: |
-      ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING') && (github.base_ref == 'main' )) ||
-      ((github.event.action == 'synchronize') && (github.base_ref == 'main') && contains(github.event.pull_request.labels.*.name, 'TESTING')) ||
-      (github.ref_name == 'main')
     container:
       image: osrf/ros:${{ matrix.ros_distribution }}-desktop
     timeout-minutes: 5
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04]
         ros_distribution: [humble]
     steps:
       - name: Checkout code
diff --git a/.github/workflows/humble_test.yaml b/.github/workflows/humble_test.yaml
index 0464e49..4499fce 100644
--- a/.github/workflows/humble_test.yaml
+++ b/.github/workflows/humble_test.yaml
@@ -1,27 +1,22 @@
-name: ci_humble
+#TODO fix file name and "name:" like build and test  
+
+name: build_and_test
 
 on:
   push:
     branches:
       - "main"
-      - "feat/add_ci_config"
   pull_request:
-    types: [opened, synchronize, labeled]
+    types: [opened, synchronize ]
 jobs:
   ci:
-    runs-on: ${{ matrix.os }}
-    if: |
-      ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING') && (github.base_ref == 'main' )) ||
-      ((github.event.action == 'synchronize') && (github.base_ref == 'main') && contains(github.event.pull_request.labels.*.name, 'TESTING')) ||
-      (github.ref_name == 'main')
     container:
       image: osrf/ros:${{ matrix.ros_distribution }}-desktop
     timeout-minutes: 3
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04]
-        ros_distribution: [humble]
+        ros_distribution: [humble] 
         comm-target: [native , mros]
         comm-data-type: [string, twist]
     steps:
@@ -74,9 +69,9 @@ jobs:
         shell: bash
         run : |
             ./test_echoback_${{ matrix.comm-data-type }}/mros2-posix &
-            mros_pid=$!  # mROSのプロセスIDを取得
+            mros_pid=$!  # get mROS process id
 
-            # Native ROSをバックグラウンドで実行
+            # Run Native ROS in background
             cd ws_host/
             source /opt/ros/humble/setup.bash
             source install/setup.bash
diff --git a/README.md b/README.md
index dd01bca..43c9b97 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ sudo apt-get update && sudo apt-get install -y \
   libssl-dev libreadline-dev zlib1g-dev \
   make autoconf automake cmake \
   pkg-config curl \
-  net-tools netcat jinja2
+  net-tools netcat python3-jinja2
 ```
 
 Please check the IP address and netmask of the execution environment.