Skip to content

Commit 3bc909b

Browse files
committed
Align with ros-humble
1 parent 6e58dcd commit 3bc909b

File tree

9 files changed

+57
-27
lines changed

9 files changed

+57
-27
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ jobs:
2121
- name: Install vinca
2222
run: |
2323
pip install git+https://github.com/RoboStack/vinca.git
24-
2524
- name: Generate recipes for linux-64
2625
run: |
2726
git clean -fdx
2827
vinca --multiple --platform linux-64
2928
- name: Generate azure pipelines for linux-64
3029
run: |
31-
vinca-gha --platform linux-64 --trigger-branch buildbranch_linux -d ./recipes --additional-recipes
30+
vinca-gha --platform linux-64 --trigger-branch buildbranch_linux -d ./recipes
3231
- name: Commit files for linux-64
3332
run: |
3433
if [[ -f "linux.yml" ]]; then
@@ -53,7 +52,7 @@ jobs:
5352
vinca --multiple --platform osx-64
5453
- name: Generate azure pipelines for osx-64
5554
run: |
56-
vinca-gha --platform osx-64 --trigger-branch buildbranch_osx -d ./recipes --additional-recipes
55+
vinca-gha --platform osx-64 --trigger-branch buildbranch_osx -d ./recipes
5756
- name: Commit files for osx-64
5857
run: |
5958
if [[ -f "osx.yml" ]]; then
@@ -78,7 +77,7 @@ jobs:
7877
vinca --multiple --platform osx-arm64
7978
- name: Generate azure pipelines for osx-arm64
8079
run: |
81-
vinca-gha --platform osx-arm64 --trigger-branch buildbranch_osx_arm64 -d ./recipes --additional-recipes
80+
vinca-gha --platform osx-arm64 --trigger-branch buildbranch_osx_arm64 -d ./recipes
8281
- name: Commit files for osx-arm64
8382
run: |
8483
if [[ -f "osx_arm64.yml" ]]; then
@@ -103,7 +102,8 @@ jobs:
103102
vinca --multiple --platform win-64
104103
- name: Generate azure pipelines for win-64
105104
run: |
106-
vinca-gha --platform win-64 --trigger-branch buildbranch_win -d ./recipes --additional-recipes
105+
# --batch_size 10 is a workaround for https://github.com/RoboStack/robostack.github.io/issues/105
106+
vinca-gha --platform win-64 --trigger-branch buildbranch_win -d ./recipes --batch_size 10
107107
- name: Commit files for win-64
108108
run: |
109109
if [[ -f "win.yml" ]]; then
@@ -128,7 +128,7 @@ jobs:
128128
vinca --multiple --platform linux-aarch64
129129
- name: Generate azure pipelines for linux-aarch64
130130
run: |
131-
vinca-gha --platform linux-aarch64 --trigger-branch buildbranch_linux_aarch64 -d ./recipes --additional-recipes
131+
vinca-gha --platform linux-aarch64 --trigger-branch buildbranch_linux_aarch64 -d ./recipes
132132
- name: Commit files for linux-aarch64
133133
run: |
134134
if [[ -f "linux_aarch64.yml" ]]; then

.scripts/build_unix.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,15 @@ if [[ "$target" == *"osx"* ]]; then
2626
export PATH=$(echo $PATH | tr ":" "\n" | grep -v 'homebrew' | xargs | tr ' ' ':')
2727
fi
2828

29-
extra_channel=""
30-
cross_compile=""
29+
if [[ "$target" == "emscripten-wasm32" ]]; then
30+
extra_channel="-c https://repo.mamba.pm/emscripten-forge"
31+
cross_compile="--target-platform emscripten-wasm32 --test skip"
32+
33+
else
34+
extra_channel=""
35+
cross_compile=""
36+
fi
37+
3138

3239
for recipe in ${CURRENT_RECIPES[@]}; do
3340
pixi run -v rattler-build build \

.scripts/build_win.bat

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,14 @@ for %%X in (%CURRENT_RECIPES%) do (
2525
rem -m %FEEDSTOCK_ROOT%\.ci_support\conda_forge_pinnings.yaml
2626
)
2727

28-
pixi run upload "%CONDA_BLD_PATH%\win-64\*.conda" --force
29-
if errorlevel 1 exit 1
28+
:: Check if .conda files exist in the win-64 directory
29+
dir /b "%CONDA_BLD_PATH%\win-64\*.conda" >nul 2>&1
30+
if errorlevel 1 (
31+
:: No files found, display warning
32+
echo Warning: No .conda files found in %CONDA_BLD_PATH%\win-64
33+
echo This might be due to all the packages being skipped
34+
) else (
35+
:: Files found, run the upload command
36+
pixi run upload "%CONDA_BLD_PATH%\win-64\*.conda" --force
37+
if errorlevel 1 exit 1
38+
)

check_patches_clean_apply.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,3 +172,4 @@ def main() -> None:
172172

173173
if __name__ == "__main__":
174174
main()
175+

conda_build_config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ graphviz:
1717

1818
# Workaround for https://github.com/RoboStack/ros-jazzy/pull/40#issuecomment-2782226697
1919
cmake:
20-
- 3.*
20+
- 3.*
2121

2222
cdt_name: # [linux]
2323
- conda # [linux]
@@ -51,8 +51,8 @@ cxx_compiler_version: # [unix]
5151
- 18 # [osx]
5252

5353
libzenohc:
54-
- 1.3.4
54+
- 1.4.0
5555
libzenohcxx:
56-
- 1.3.4
56+
- 1.4.0
5757
libcap:
5858
- 2.71

pixi.lock

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ git = "*"
2323

2424
[pypi-dependencies]
2525
# This is tipically the latest commit on main branch
26-
vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "b0cc367fe249bc96ebf6ce49927d4e1d4aeb13b1" }
26+
vinca = { git = "https://github.com/RoboStack/vinca.git", rev = "7d3a05e01d6898201a66ba2cf6ea771250671f58" }
2727
# Uncomment this line to work with a local vinca for faster iteration, but remember to comment it back
2828
# (and regenerate the pixi.lock) once you push the modified commit to the repo
29-
#vinca = { path = "../vinca", editable = true }
29+
# vinca = { path = "../vinca", editable = true }
3030

3131
[tasks]
3232
remove-recipes = { cmd = "rm -rf recipes_only_patch; rm -rf recipes; mkdir recipes" }

pkg_additional_info.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,10 @@ diagnostic_aggregator:
138138
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
139139
diagnostic_updater:
140140
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
141+
octomap_ros:
142+
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
141143
rviz_ogre_vendor:
142144
additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON"
143145
# Remove once https://github.com/PickNikRobotics/data_tamer/pull/58 is merged and released
144146
data_tamer_cpp:
145-
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
147+
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"

robostack.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ bullet:
3939
robostack: [bullet]
4040
bzip2:
4141
robostack: [bzip2]
42-
cartographer:
43-
robostack: [cartographer]
4442
ca-certificates:
4543
robostack: [ca-certificates]
4644
cargo:
@@ -132,7 +130,11 @@ glut:
132130
osx: []
133131
win64: [freeglut]
134132
google-mock:
135-
robostack: [gmock]
133+
robostack:
134+
linux: [gmock]
135+
osx: [gmock]
136+
win64: [gmock]
137+
emscripten: []
136138
graphicsmagick:
137139
robostack: [graphicsmagick]
138140
graphviz:
@@ -264,6 +266,8 @@ libcurl-dev:
264266
robostack: [libcurl]
265267
libdc1394-dev:
266268
robostack: [libdc1394]
269+
libdraco-dev:
270+
robostack: [draco]
267271
libdw-dev:
268272
robostack:
269273
linux: [elfutils]
@@ -345,6 +349,8 @@ liblz4-dev:
345349
robostack: [lz4]
346350
libmicrohttpd:
347351
robostack: [libmicrohttpd]
352+
libnanoflann-dev:
353+
robostack: [nanoflann]
348354
libncurses-dev:
349355
robostack:
350356
linux: [ncurses]
@@ -371,6 +377,8 @@ libomp-dev:
371377
linux: [libgomp]
372378
osx: [llvm-openmp]
373379
win64: []
380+
libopen3d-dev:
381+
robostack: [open3d, REQUIRE_OPENGL]
374382
libopenblas-dev:
375383
robostack: [libblas]
376384
libopencv-dev:
@@ -923,6 +931,8 @@ qt5-qmake:
923931
robostack: [qt-main, REQUIRE_OPENGL]
924932
qtbase5-dev:
925933
robostack: [qt-main, REQUIRE_OPENGL]
934+
range-v3:
935+
robostack: [range-v3]
926936
rapidjson-dev:
927937
robostack: [rapidjson]
928938
roboticstoolbox-python:
@@ -964,7 +974,7 @@ sshpass:
964974
subversion:
965975
robostack: [subversion]
966976
suitesparse:
967-
robostack: [suitesparse]
977+
robostack: [suitesparse, blas-devel]
968978
sqlite3:
969979
robostack: [sqlite 3.*]
970980
swig:

0 commit comments

Comments
 (0)