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

Fix cpack and add ruckig cpack generation and upload #585

Merged
merged 4 commits into from
Jan 21, 2025
Merged

Fix cpack and add ruckig cpack generation and upload #585

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
1c1f25c
Add ruckig cpack build and improve cpack depends
Levi-Armstrong Jan 21, 2025
c0de0f8
fixup
Levi-Armstrong Jan 21, 2025
fd6c9fc
fixup
Levi-Armstrong Jan 21, 2025
5131c5f
fixup
Levi-Armstrong Jan 21, 2025
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
8 changes: 8 additions & 0 deletions .github/workflows/package_debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,14 @@ jobs:
run: |
mkdir $GITHUB_WORKSPACE/artifacts

- name: Package ruckig
working-directory: upstream_ws/build/ruckig
shell: bash
run: |
cpack --config CPackConfig.cmake
cp ./*.deb $GITHUB_WORKSPACE/artifacts
cp ./*.tar.xz $GITHUB_WORKSPACE/artifacts

- name: Package tesseract_command_language
working-directory: target_ws/build/tesseract_command_language
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows_dependencies.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
version: 2.1.3
- git:
local-name: ruckig
uri: https://github.com/pantor/ruckig.git
version: v0.9.2
uri: https://github.com/Levi-Armstrong/ruckig.git
version: cpack-v0.9.2
4 changes: 2 additions & 2 deletions dependencies.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
version: 2.1.3
- git:
local-name: ruckig
uri: https://github.com/pantor/ruckig.git
version: v0.9.2
uri: https://github.com/Levi-Armstrong/ruckig.git
version: cpack-v0.9.2
4 changes: 2 additions & 2 deletions dependencies_unstable.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
version: master
- git:
local-name: ruckig
uri: https://github.com/pantor/ruckig.git
version: v0.9.2
uri: https://github.com/Levi-Armstrong/ruckig.git
version: cpack-v0.9.2
24 changes: 18 additions & 6 deletions tesseract_examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,22 +177,34 @@ if(TESSERACT_PACKAGE)
"libconsole-bridge-dev"
"libpcl-dev"
"${TESSERACT_PACKAGE_PREFIX}tesseract-common"
"${TESSERACT_PACKAGE_PREFIX}tesseract-collision"
"${TESSERACT_PACKAGE_PREFIX}tesseract-collision-core"
"${TESSERACT_PACKAGE_PREFIX}tesseract-collision-bullet"
"${TESSERACT_PACKAGE_PREFIX}tesseract-environment"
"${TESSERACT_PACKAGE_PREFIX}tesseract-command-language"
"${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners"
"${TESSERACT_PACKAGE_PREFIX}tesseract-task-composer"
"${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-core"
"${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-ompl"
"${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-trajopt"
"${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-trajopt-ifopt"
"${TESSERACT_PACKAGE_PREFIX}tesseract-task-composer-core"
"${TESSERACT_PACKAGE_PREFIX}tesseract-task-composer-planning"
"${TESSERACT_PACKAGE_PREFIX}tesseract-task-composer-taskflow"
"${TESSERACT_PACKAGE_PREFIX}trajopt-sqp"
"${TESSERACT_PACKAGE_PREFIX}trajopt-ifopt"
WINDOWS_DEPENDS
"console-bridge"
"pcl"
"${TESSERACT_PACKAGE_PREFIX}tesseract-common"
"${TESSERACT_PACKAGE_PREFIX}tesseract-collision"
"${TESSERACT_PACKAGE_PREFIX}tesseract-collision-core"
"${TESSERACT_PACKAGE_PREFIX}tesseract-collision-bullet"
"${TESSERACT_PACKAGE_PREFIX}tesseract-environment"
"${TESSERACT_PACKAGE_PREFIX}tesseract-command-language"
"${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners"
"${TESSERACT_PACKAGE_PREFIX}tesseract-task-composer"
"${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-core"
"${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-ompl"
"${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-trajopt"
"${TESSERACT_PACKAGE_PREFIX}tesseract-motion-planners-trajopt-ifopt"
"${TESSERACT_PACKAGE_PREFIX}tesseract-task-composer-core"
"${TESSERACT_PACKAGE_PREFIX}tesseract-task-composer-planning"
"${TESSERACT_PACKAGE_PREFIX}tesseract-task-composer-taskflow"
"${TESSERACT_PACKAGE_PREFIX}trajopt-sqp"
"${TESSERACT_PACKAGE_PREFIX}trajopt-ifopt")

Expand Down
4 changes: 2 additions & 2 deletions tesseract_task_composer/taskflow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ if(TESSERACT_PACKAGE)
VERSION ${pkg_extracted_version}
DESCRIPTION "Tesseract task composer taskflow components"
COMPONENT_DEPENDS core
LINUX_DEPENDS "taskflow | ${TESSERACT_PACKAGE_PREFIX}taskflow"
WINDOWS_DEPENDS "taskflow | ${TESSERACT_PACKAGE_PREFIX}taskflow")
LINUX_DEPENDS "taskflow | libtaskflow-cpp-dev | ${TESSERACT_PACKAGE_PREFIX}taskflow"
WINDOWS_DEPENDS "taskflow | libtaskflow-cpp-dev | ${TESSERACT_PACKAGE_PREFIX}taskflow")
endif()
Loading