Skip to content

Commit

Permalink
Merge branch 'master' into develop/kalman_filter
Browse files Browse the repository at this point in the history
  • Loading branch information
k-okada authored Dec 8, 2024
2 parents e1a0700 + 6715549 commit dd66ff0
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 16 deletions.
21 changes: 20 additions & 1 deletion .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ jobs:
CONTAINER: ubuntu:20.04
# BUILD_PKGS: cmd_vel_smoother contact_states_observer joy_mouse jsk_teleop_joy

container: ${{ matrix.CONTAINER }}
container:
image: ${{ matrix.CONTAINER }}
volumes:
- /tmp/node20:/__e/node20

steps:
- name: Install latest git ( use sudo for ros-ubuntu )
run: |
Expand All @@ -48,6 +52,21 @@ jobs:
git config --global --add safe.directory $GITHUB_WORKSPACE
fi
- name: Try to replace `node` with an glibc 2.17
shell: bash
run: |
if [ "${{ matrix.CONTAINER }}" = "jskrobotics/ros-ubuntu:14.04" ]; then
export USER=$(whoami)
sudo chmod 777 -R /__e/node20
sudo chown -R $USER /__e/node20
fi
ls -lar /__e/node20 &&
sudo apt-get install -y curl &&
curl -Lo /tmp/node.tar.gz https://unofficial-builds.nodejs.org/download/release/v20.17.0/node-v20.17.0-linux-x64-glibc-217.tar.gz &&
cd /__e/node20 &&
tar -x --strip-components=1 -f /tmp/node.tar.gz &&
ls -lar /__e/node20/bin/
- name: Chcekout
uses: actions/[email protected]

Expand Down
29 changes: 15 additions & 14 deletions jsk_teleop_joy/package.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<package>
<package format="3">
<name>jsk_teleop_joy</name>
<description>
jsk_teleop_joy
Expand All @@ -10,19 +10,20 @@
<url>http://ros.org/wiki/jsk_teleop_joy</url>
<buildtool_depend>catkin</buildtool_depend>

<run_depend>ps3joy</run_depend>
<run_depend>tf</run_depend>
<run_depend>view_controller_msgs</run_depend>
<run_depend>interactive_markers</run_depend>
<run_depend>visualization_msgs</run_depend>
<run_depend>jsk_footstep_msgs</run_depend>
<run_depend>jsk_interactive_marker</run_depend>
<run_depend>diagnostic_msgs</run_depend>
<run_depend>diagnostic_updater</run_depend>
<run_depend>jsk_rviz_plugins</run_depend>
<run_depend>joy_mouse</run_depend>
<run_depend>image_view2</run_depend>
<run_depend>python-pygame</run_depend>
<exec_depend>ps3joy</exec_depend>
<exec_depend>tf</exec_depend>
<exec_depend>view_controller_msgs</exec_depend>
<exec_depend>interactive_markers</exec_depend>
<exec_depend>visualization_msgs</exec_depend>
<exec_depend>jsk_footstep_msgs</exec_depend>
<exec_depend>jsk_interactive_marker</exec_depend>
<exec_depend>diagnostic_msgs</exec_depend>
<exec_depend>diagnostic_updater</exec_depend>
<exec_depend>jsk_rviz_plugins</exec_depend>
<exec_depend>joy_mouse</exec_depend>
<exec_depend>image_view2</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-pygame</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-pygame</exec_depend>

<export>
<jsk_teleop_joy plugin="${prefix}/plugin.xml"/>
Expand Down

0 comments on commit dd66ff0

Please sign in to comment.