Skip to content

Commit

Permalink
fix CI Setting
Browse files Browse the repository at this point in the history
  • Loading branch information
MrBearing committed Oct 22, 2024
1 parent 4f41e33 commit 3b2801d
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci_jazzy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
sanehal_vehicle_description
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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のインストール
Expand Down
2 changes: 1 addition & 1 deletion build_depends.repos
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sanehal_bringup/launch/diffbot.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3b2801d

Please sign in to comment.