Skip to content
This repository has been archived by the owner on Jul 12, 2024. It is now read-only.

[catkin] Add ROS_PYTHON_VERSION for python conditional dependencies #17

Merged
merged 2 commits into from
Aug 21, 2019
Merged

[catkin] Add ROS_PYTHON_VERSION for python conditional dependencies #17

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bd7aec
Add ROS_PYTHON_VERSION for newer catkin.
Aug 20, 2019
d7e9832
Fix typo.
seanyen Aug 21, 2019
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
1 change: 1 addition & 0 deletions ros-catkin-build/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
pool:
vmImage: 'windows-2019'
variables:
ROS_PYTHON_VERSION: '2'
ROS_DISTRO: 'melodic'
ROS_SHARE_DIR: 'c:\opt\ros\melodic\x64\share'
ROS_ETC_DIR: 'c:\opt\ros\melodic\x64\etc\ros'
Expand Down
1 change: 1 addition & 0 deletions ros-catkin-build/ros-melodic-desktop.runtests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
pool:
vmImage: 'windows-2019'
variables:
ROS_PYTHON_VERSION: '2'
ROS_DISTRO: 'melodic'
ROS_ETC_DIR: 'c:\opt\ros\melodic\x64\etc\ros'
ROSDISTRO_INDEX_URL: 'https://raw.githubusercontent.com/ms-iot/rosdistro-db/init_windows/index.yaml'
Expand Down
1 change: 1 addition & 0 deletions ros-catkin-build/ros-melodic-desktop_full.runtests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
pool:
vmImage: 'windows-2019'
variables:
ROS_PYTHON_VERSION: '2'
ROS_DISTRO: 'melodic'
ROS_ETC_DIR: 'c:\opt\ros\melodic\x64\etc\ros'
ROSDISTRO_INDEX_URL: 'https://raw.githubusercontent.com/ms-iot/rosdistro-db/init_windows/index.yaml'
Expand Down
1 change: 1 addition & 0 deletions ros-catkin-build/ros-melodic-ros_base.runtests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
pool:
vmImage: 'windows-2019'
variables:
ROS_PYTHON_VERSION: '2'
ROS_DISTRO: 'melodic'
ROS_ETC_DIR: 'c:\opt\ros\melodic\x64\etc\ros'
ROSDISTRO_INDEX_URL: 'https://raw.githubusercontent.com/ms-iot/rosdistro-db/init_windows/index.yaml'
Expand Down
13 changes: 4 additions & 9 deletions ros-colcon-build/crystal/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,21 @@ jobs:
ROSWIN_METAPACKAGE: 'ALL'
ROSWIN_ADDITIONAL_PACKAGE: 'ros_rosdeps'
ROSWIN_VSTOOL: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat'
ROSWIN_CMAKE_INSTALL_PREFIX: 'c:/opt/ros/crystal/x64'
BUILD_TOOL_PACKAGE: 'ros-colcon-tools'
BUILD_TOOL_PACKAGE_VERSION: '0.0.1.1905240527'
PYTHON_LOCATION: 'c:\opt\python37amd64'
ROS_PYTHON_VERSION: '3'
ROS_DISTRO: 'crystal'
ROS_ETC_DIR: 'c:\opt\ros\crystal\x64\etc\ros'
strategy:
matrix:
crystal-ros_core:
ROSWIN_METAPACKAGE: 'ros_core'
ROS_DISTRO: 'crystal'
ROS_ETC_DIR: 'c:\opt\ros\crystal\x64\etc\ros'
ROSWIN_CMAKE_INSTALL_PREFIX: 'c:/opt/ros/crystal/x64'
crystal-ros_base:
ROSWIN_METAPACKAGE: 'ros_base'
ROS_DISTRO: 'crystal'
ROS_ETC_DIR: 'c:\opt\ros\crystal\x64\etc\ros'
ROSWIN_CMAKE_INSTALL_PREFIX: 'c:/opt/ros/crystal/x64'
crystal-desktop:
ROSWIN_METAPACKAGE: 'desktop'
ROS_DISTRO: 'crystal'
ROS_ETC_DIR: 'c:\opt\ros\crystal\x64\etc\ros'
ROSWIN_CMAKE_INSTALL_PREFIX: 'c:/opt/ros/crystal/x64'
steps:
# - template: ..\..\common\agent-clean.yml
- template: ..\common\checkout.yml
Expand Down
1 change: 1 addition & 0 deletions ros-colcon-build/dashing/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
ROSWIN_VSTOOL: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat'
ROSWIN_CMAKE_INSTALL_PREFIX: 'c:/opt/ros/dashing/x64'
ROSWIN_ADDITIONAL_PACKAGE: 'ros_rosdeps'
ROS_PYTHON_VERSION: '3'
ROS_DISTRO: 'dashing'
ROS_ETC_DIR: 'c:\opt\ros\dashing\x64\etc\ros'
BUILD_TOOL_PACKAGE: 'ros-colcon-tools'
Expand Down
4 changes: 2 additions & 2 deletions ros-colcon-build/melodic/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ jobs:
BUILD_TOOL_PACKAGE: 'ros-colcon-tools'
BUILD_TOOL_PACKAGE_VERSION: '0.0.1.1905240527'
PYTHON_LOCATION: 'c:\opt\python37amd64'
ROS_PYTHON_VERSION: '3'
OS_DISTRO: 'melodic'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please check if this is a typo

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! You just save the build today. :)

strategy:
matrix:
melodic-ros_base:
ROSWIN_METAPACKAGE: 'ros_core'
ROSDISTRO_INDEX_URL: 'https://raw.githubusercontent.com/ms-iot/rosdistro-db/init_windows/index.yaml'
ROS_DISTRO: 'melodic'
ROS_ETC_DIR: 'c:\opt\ros\melodic\x64\etc\ros'
ROSWIN_CMAKE_INSTALL_PREFIX: 'c:/opt/ros/melodic/x64'
melodic-desktop_full:
ROSWIN_METAPACKAGE: 'desktop_full'
ROSDISTRO_INDEX_URL: 'https://raw.githubusercontent.com/ms-iot/rosdistro-db/init_windows/index.yaml'
ROS_DISTRO: 'melodic'
ROS_ETC_DIR: 'c:\opt\ros\melodic\x64\etc\ros'
ROSWIN_CMAKE_INSTALL_PREFIX: 'c:/opt/ros/melodic/x64'
steps:
Expand Down