Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to jsk_travis 0.5.27 #507

Merged
merged 4 commits into from
Jul 10, 2024
Merged

update to jsk_travis 0.5.27 #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea8b537
update to jsk_travis 0.5.27
k-okada Jul 9, 2024
9bf8b50
workaround required for checkout@v3, https://github.com/actions/check…
k-okada Jul 9, 2024
e8f565b
dialogflow_task_executive/gdrive_ros/respeaker_ros/ros_speech_recogni…
k-okada Jul 9, 2024
d6bdcee
.travis.rosinstall.indigo: use release veresion of catkin_virtualenv …
k-okada Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:

env:
DISPLAY: ':0.0'
# workaround required for checkout@v3, https://github.com/actions/checkout/issues/1590
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

jobs:
ros:
Expand Down
2 changes: 1 addition & 1 deletion .travis
Open in desktop
Submodule .travis updated 24 files
+4 −4 .github/workflows/generate_action_config.py
+10 −4 .github/workflows/indigo.yml
+10 −4 .github/workflows/kinetic.yml
+38 −24 .github/workflows/main.yml
+10 −4 .github/workflows/melodic.yml
+10 −4 .github/workflows/noetic.yml
+1 −1 .github/workflows/python2.yml
+1 −1 .github/workflows/python3.yml
+3 −2 .travis.yml
+0 −0 CATKIN_IGNORE
+41 −0 CHANGELOG.rst
+5 −1 action.yml
+1 −1 docker/Dockerfile.ros-ubuntu:14.04-pcl
+1 −1 docker/Dockerfile.ros-ubuntu:14.04-pcl1.8
+1 −1 docker/Dockerfile.ros-ubuntu:16.04
+1 −1 docker/Dockerfile.ros-ubuntu:16.04-pcl
+1 −1 docker/Dockerfile.ros-ubuntu:18.04
+1 −1 docker/Dockerfile.ros-ubuntu:18.04-pcl
+1 −1 docker/Dockerfile.ros-ubuntu:20.04-pcl
+1 −1 package.xml
+12 −0 rosdep_snapshots/30-bionic.list
+12 −0 rosdep_snapshots/30-xenial.list
+9 −3 travis.sh
+11 −1 travis_jenkins.py
4 changes: 2 additions & 2 deletions .travis.rosinstall.indigo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# we need to avoid pip upgrade
- git:
local-name: locusrobotics/catkin_virtualenv
uri: https://github.com/locusrobotics/catkin_virtualenv
version: 0.2.2
uri: https://github.com/locusrobotics/catkin_virtualenv-release
version: release/melodic/catkin_virtualenv/0.2.2-0
5 changes: 4 additions & 1 deletion dialogflow_task_executive/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ elseif("$ENV{ROS_DISTRO}" STREQUAL "indigo")
COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/requirements.txt.indigo ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
catkin_generate_virtualenv(PYTHON_INTERPRETER python2)
file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
catkin_generate_virtualenv(PYTHON_INTERPRETER python2
# https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem)
elseif("$ENV{ROS_DISTRO}" STRGREATER "melodic")
catkin_generate_virtualenv(
INPUT_REQUIREMENTS requirements.in.noetic
Expand Down
10 changes: 10 additions & 0 deletions gdrive_ros/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,20 @@ catkin_package(
message_runtime
)

if("$ENV{ROS_DISTRO}" STREQUAL "indigo")
file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
catkin_generate_virtualenv(
PYTHON_INTERPRETER python3
CHECK_VENV FALSE
# https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
)
else()
catkin_generate_virtualenv(
PYTHON_INTERPRETER python3
CHECK_VENV FALSE
)
endif()


catkin_install_python(PROGRAMS node_scripts/gdrive_server_node.py node_scripts/sample_gdrive_rospy_client.py
Expand Down
7 changes: 7 additions & 0 deletions respeaker_ros/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ if($ENV{ROS_DISTRO} STRGREATER "melodic")
PYTHON_INTERPRETER python3
CHECK_VENV FALSE
)
elseif("$ENV{ROS_DISTRO}" STREQUAL "indigo")
file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
catkin_generate_virtualenv(
PYTHON_INTERPRETER python2
# https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
)
else()
catkin_generate_virtualenv(
PYTHON_INTERPRETER python2
Expand Down
11 changes: 10 additions & 1 deletion ros_speech_recognition/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,16 @@ if($ENV{ROS_DISTRO} STREQUAL "indigo" OR
COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/requirements.txt.indigo ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
catkin_generate_virtualenv(PYTHON_INTERPRETER python2)
if("$ENV{ROS_DISTRO}" STREQUAL "indigo")
file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
catkin_generate_virtualenv(
PYTHON_INTERPRETER python2
# https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
)
else()
catkin_generate_virtualenv(PYTHON_INTERPRETER python2)
endif()
else()
catkin_generate_virtualenv(
PYTHON_INTERPRETER python3
Expand Down
7 changes: 7 additions & 0 deletions sesame_ros/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ if($ENV{ROS_DISTRO} STRGREATER "melodic")
catkin_generate_virtualenv(
PYTHON_INTERPRETER python3
)
elseif("$ENV{ROS_DISTRO}" STREQUAL "indigo")
file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
catkin_generate_virtualenv(
PYTHON_INTERPRETER python2
# https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
)
else()
catkin_generate_virtualenv(
PYTHON_INTERPRETER python2
Expand Down
10 changes: 10 additions & 0 deletions switchbot_ros/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,20 @@ generate_messages(

catkin_package()

if("$ENV{ROS_DISTRO}" STREQUAL "indigo")
file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
catkin_generate_virtualenv(
PYTHON_INTERPRETER python3
CHECK_VENV FALSE
# https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
)
else()
catkin_generate_virtualenv(
PYTHON_INTERPRETER python3
CHECK_VENV FALSE
)
endif()

include_directories()

Expand Down
Loading