Skip to content

Commit 4a19df0

Browse files
authored
Add fmt and spdlog dependencies to walking-controllers (#1926)
1 parent e88e752 commit 4a19df0

File tree

3 files changed

+22
-18
lines changed

3 files changed

+22
-18
lines changed

.github/workflows/generate-conda-packages.yaml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -203,22 +203,23 @@ jobs:
203203
pixi auth logout https://prefix.dev
204204
205205
# Only on linux-64 we upload noarch packages (noarch packages need to be uploaded only once, as they can be reused across platforms)
206-
- name: Upload conda packages (noarch)
207-
shell: bash -l {0}
208-
# Upload by default on schedule events, and on workflow dispatch only if input upload_conda_binaries is 'true'
209-
if: matrix.conda_platform == 'linux-64' && (github.event_name == 'schedule' || github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.upload_conda_binaries == 'true'))
210-
env:
211-
ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_API_TOKEN }}
212-
PREFIX_DEV_TOKEN: ${{ secrets.PREFIX_DEV_TOKEN }}
213-
run: |
214-
cd ${CONDA_BLD_PATH}/noarch/
215-
ls *.conda
216-
anaconda upload --skip-existing *.conda
217-
pixi auth login https://prefix.dev --token $PREFIX_DEV_TOKEN
218-
for condapackage in *.conda; do
219-
pixi upload https://prefix.dev/api/v1/upload/robotology "$condapackage"
220-
done
221-
pixi auth logout https://prefix.dev
206+
# This is disable until we re-enable robot-log-visualizer package
207+
#- name: Upload conda packages (noarch)
208+
# shell: bash -l {0}
209+
# # Upload by default on schedule events, and on workflow dispatch only if input upload_conda_binaries is 'true'
210+
# if: matrix.conda_platform == 'linux-64' && (github.event_name == 'schedule' || github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.upload_conda_binaries == 'true'))
211+
# env:
212+
# ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_API_TOKEN }}
213+
# PREFIX_DEV_TOKEN: ${{ secrets.PREFIX_DEV_TOKEN }}
214+
# run: |
215+
# cd ${CONDA_BLD_PATH}/noarch/
216+
# ls *.conda
217+
# anaconda upload --skip-existing *.conda
218+
# pixi auth login https://prefix.dev --token $PREFIX_DEV_TOKEN
219+
# for condapackage in *.conda; do
220+
# pixi upload https://prefix.dev/api/v1/upload/robotology "$condapackage"
221+
# done
222+
# pixi auth logout https://prefix.dev
222223

223224
# If the generate-conda-packages completed correctly and binaries are uploaded,
224225
# bump automatically the CONDA_BUILD_NUMBER in conda/cmake/CondaGenerationOptions.cmake

cmake/Buildwalking-controllers.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,7 @@ ycm_ep_helper(walking-controllers TYPE GIT
3434
FOLDER src
3535
DEPENDS ${walking-controllers_DEPENDS})
3636

37-
set(walking-controllers_CONDA_DEPENDENCIES eigen tomlplusplus)
37+
# fmt and spdlog are not direct dependencies but a transitive dep
38+
# via blf, they are added as a workaround for
39+
# https://github.com/robotology/walking-controllers/issues/207
40+
set(walking-controllers_CONDA_DEPENDENCIES eigen tomlplusplus fmt spdlog)

conda/cmake/CondaGenerationOptions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# to ensure that binaries belonging to different rebuilds
33
# can be distinguished even if the version number is the same
44
if(NOT CONDA_BUILD_NUMBER)
5-
set(CONDA_BUILD_NUMBER 169)
5+
set(CONDA_BUILD_NUMBER 170)
66
endif()
77

88
# This option is enabled only when the metapackages robotology-distro are

0 commit comments

Comments
 (0)