Skip to content

Commit

Permalink
Merge pull request #10 from MrBearing/feat/migrate_for_jazzy
Browse files Browse the repository at this point in the history
add ci setting and jazzy
  • Loading branch information
MrBearing authored Sep 8, 2024
2 parents ff2e795 + 6ce970e commit d856138
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 15 deletions.
39 changes: 39 additions & 0 deletions .github/workflow/ci_jazzy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: ci_jazzy

on:
push:
branches:
- "jazzy"
pull_request:
types: [opened, synchronize, labeled]

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: 20
strategy:
fail-fast: false
matrix:
os: [ubuntu-24.04]
ros_distribution: [jazzy]
steps:
- uses: actions/checkout@v3
- uses: ros-tooling/[email protected]
with:
required-ros-distributions: ${{ matrix.ros_distribution }}
- name: Build and Test
uses: ros-tooling/[email protected]
with:
target-ros2-distro: ${{ matrix.ros_distribution }}
import-token: ${{ secrets.GITHUB_TOKEN }}
package-name: |
sanehal
sanehal_bringup
sanehal_description
vcs-repo-file-url: build_depends.repos
10 changes: 5 additions & 5 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"limitSymbolsToIncludedHeaders": false
},
"includePath": [
"/opt/ros/humble/include/**",
"/home/takumi/ws_humble/src/PlayStation-JoyInterface-ROS2/p9n_example/include/**",
"/home/takumi/ws_humble/src/PlayStation-JoyInterface-ROS2/p9n_interface/include/**",
"/home/takumi/ws_humble/src/PlayStation-JoyInterface-ROS2/p9n_node/include/**",
"/home/takumi/ws_humble/src/PlayStation-JoyInterface-ROS2/p9n_test/include/**",
"/opt/ros/jazzy/include/**",
"/home/takumi/ws_jazzy/src/PlayStation-JoyInterface-ROS2/p9n_example/include/**",
"/home/takumi/ws_jazzy/src/PlayStation-JoyInterface-ROS2/p9n_interface/include/**",
"/home/takumi/ws_jazzy/src/PlayStation-JoyInterface-ROS2/p9n_node/include/**",
"/home/takumi/ws_jazzy/src/PlayStation-JoyInterface-ROS2/p9n_test/include/**",
"/usr/include/**"
],
"name": "ROS",
Expand Down
14 changes: 7 additions & 7 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"python.autoComplete.extraPaths": [
"/home/takumi/ws_humble/install/chatgpt_ros_interface/local/lib/python3.10/dist-packages",
"/opt/ros/humble/lib/python3.10/site-packages",
"/opt/ros/humble/local/lib/python3.10/dist-packages"
"/home/takumi/ws_jazzy/install/chatgpt_ros_interface/local/lib/python3.10/dist-packages",
"/opt/ros/jazzy/lib/python3.10/site-packages",
"/opt/ros/jazzy/local/lib/python3.10/dist-packages"
],
"python.analysis.extraPaths": [
"/home/takumi/ws_humble/install/chatgpt_ros_interface/local/lib/python3.10/dist-packages",
"/opt/ros/humble/lib/python3.10/site-packages",
"/opt/ros/humble/local/lib/python3.10/dist-packages"
"/home/takumi/ws_jazzy/install/chatgpt_ros_interface/local/lib/python3.10/dist-packages",
"/opt/ros/jazzy/lib/python3.10/site-packages",
"/opt/ros/jazzy/local/lib/python3.10/dist-packages"
],
"ros.distro": "humble"
"ros.distro": "jazzy"
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cd sanehal/
git switch issue_apply_ros2_control # 任意
vcs import src < src/sanehal/sanehal.repos
rosdep install -i --from-paths src
sudo apt install -y ros-humble-xacro #ros-depで入らなかった場合の対応
sudo apt install -y ros-jazzy-xacro #ros-depで入らなかった場合の対応
colcon build --symlink-install
```

Expand Down
4 changes: 2 additions & 2 deletions build_depends.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ repositories:
dynamixel-hardware:
type: git
url: https://github.com/dynamixel-community/dynamixel_hardware
version: humble
version: jazzy
dynamixel-workbench:
type: git
url: https://github.com/ROBOTIS-GIT/dynamixel-workbench.git
Expand All @@ -13,7 +13,7 @@ repositories:
version: ros2
ldlidar_stl_ros2:
type: git
url: https://github.com/ldrobotSensorTeam/ldlidar_stl_ros2.git
url: https://github.com/MrBearing/ldlidar_stl_ros2.git
version: master
ldlidar_stl_utils:
type: git
Expand Down

0 comments on commit d856138

Please sign in to comment.