From 3b2801d7e936c290c63c29014c550bba97ef16e0 Mon Sep 17 00:00:00 2001
From: MrBearing <takumi1988okamoto@gmail.com>
Date: Wed, 23 Oct 2024 01:14:07 +0900
Subject: [PATCH] fix CI Setting

---
 .github/workflows/ci_jazzy.yaml          | 10 +++++-----
 .vscode/settings.json                    |  5 ++++-
 README.md                                |  2 ++
 build_depends.repos                      |  2 +-
 sanehal_bringup/launch/diffbot.launch.py |  2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci_jazzy.yaml b/.github/workflows/ci_jazzy.yaml
index ed932d2..5e324e5 100644
--- a/.github/workflows/ci_jazzy.yaml
+++ b/.github/workflows/ci_jazzy.yaml
@@ -11,9 +11,9 @@ 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')
+      ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING') && (github.base_ref == 'jazzy' )) ||
+      ((github.event.action == 'synchronize') && (github.base_ref == 'jazzy') && contains(github.event.pull_request.labels.*.name, 'TESTING')) ||
+      (github.ref_name == 'jazzy')
     container:
       image: osrf/ros:${{ matrix.ros_distribution }}-desktop
     timeout-minutes: 20
@@ -32,8 +32,8 @@ jobs:
         with:
           target-ros2-distro: ${{ matrix.ros_distribution }}
           import-token: ${{ secrets.GITHUB_TOKEN }}
+          vcs-repo-file-url: build_depends.repos
           package-name: |
             sanehal
             sanehal_bringup
-            sanehal_description
-          vcs-repo-file-url: build_depends.repos
\ No newline at end of file
+            sanehal_vehicle_description
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b3941fd..c061223 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,5 +9,8 @@
         "/opt/ros/jazzy/lib/python3.10/site-packages",
         "/opt/ros/jazzy/local/lib/python3.10/dist-packages"
     ],
-    "ros.distro": "jazzy"
+    "ros.distro": "jazzy",
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter"
+    }
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index ab7c032..b53752c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Project SANEHAL
 
+[![ci_jazzy](https://github.com/MrBearing/sanehal/actions/workflows/ci_jazzy.yaml/badge.svg)](https://github.com/MrBearing/sanehal/actions/workflows/ci_jazzy.yaml)
+
 ## 事前準備
 
 - ROSのインストール
diff --git a/build_depends.repos b/build_depends.repos
index 52f9003..4859de6 100644
--- a/build_depends.repos
+++ b/build_depends.repos
@@ -14,7 +14,7 @@ repositories:
   ldlidar_stl_ros2:
     type: git
     url: https://github.com/MrBearing/ldlidar_stl_ros2.git
-    version: master
+    version: jazzy
   ldlidar_stl_utils:
     type: git
     url: https://github.com/MrBearing/ldlidar_stl_utils.git
diff --git a/sanehal_bringup/launch/diffbot.launch.py b/sanehal_bringup/launch/diffbot.launch.py
index c2661b2..c623195 100644
--- a/sanehal_bringup/launch/diffbot.launch.py
+++ b/sanehal_bringup/launch/diffbot.launch.py
@@ -15,7 +15,7 @@
 from launch import LaunchDescription
 from launch.actions import RegisterEventHandler
 from launch.event_handlers import OnProcessExit
-from launch.substitutions import Command, FindExecutable, PathJoinSubstitution,LaunchConfiguration
+from launch.substitutions import Command, FindExecutable, LaunchConfiguration, PathJoinSubstitution
 from launch.actions import DeclareLaunchArgument
 
 from launch_ros.actions import Node