Skip to content

Commit

Permalink
Add snapshot file, fix robot-localization patch
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias-Fischer committed Jan 10, 2025
1 parent 983e699 commit b3e9962
Show file tree
Hide file tree
Showing 4 changed files with 8,457 additions and 9 deletions.
7 changes: 5 additions & 2 deletions patch/ros-noetic-robot-localization.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc7f334..bb20912 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,3 @@ if(NOT EIGEN3_FOUND)
@@ -49,9 +49,6 @@ if(NOT EIGEN3_FOUND)
set(EIGEN_PACKAGE Eigen)
endif()

-if(NOT MSVC)
- set_directory_properties(PROPERTIES COMPILE_OPTIONS "-Wall;-Werror")
-endif()
add_definitions(-DEIGEN_NO_DEBUG -DEIGEN_MPL2_ONLY)

set(ROSLINT_CPP_OPTS "--filter=-build/c++11,-runtime/references")
set(ROSLINT_CPP_OPTS "--filter=-build/c++11,-runtime/references")
12 changes: 6 additions & 6 deletions pixi.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ git = "*"

[feature.beta.pypi-dependencies]
# This is tipically the latest commit on rattler-build-humble branch
vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "c47948cdec7d20d480342161751a34e92a3b0eaf" }
vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "35f09634dbd3c3697c8304a6287d3ba3e47517e1" }
# Uncomment this line to work with a local vinca for faster iteration, but remember to comment it back
# (and regenerate the pixi.lock) once you push the modified commit to the repo
#vinca = { path = "../vinca", editable = true }
Expand All @@ -38,6 +38,7 @@ remove-file = { cmd = "rm vinca.yaml; rm -rf recipes" }
copy_additional_recipes = { cmd = "sh -c 'find additional_recipes/* -maxdepth 0 -type d -exec ln -s ../{} recipes/ \\;'" }
build = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --skip-existing", depends_on = ["generate-recipes", "copy_additional_recipes"] }
build_one_package = { cmd = "cp ./patch/$PACKAGE.*patch ./recipes/$PACKAGE/patch/; rattler-build build --recipe ./recipes/$PACKAGE/recipe.yaml -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge", env = { PACKAGE = "ros-noetic-ros-base" } }
create_snapshot = { cmd = "vinca-snapshot -d noetic -o snapshot_$(date +\"%Y-%m-%d-%H-%M-%S\").yaml" }

[environments]
beta = ["beta"]
Expand Down
Loading

0 comments on commit b3e9962

Please sign in to comment.