Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 17 additions & 16 deletions .github/workflows/generate-conda-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -203,22 +203,23 @@ jobs:
pixi auth logout https://prefix.dev

# Only on linux-64 we upload noarch packages (noarch packages need to be uploaded only once, as they can be reused across platforms)
- name: Upload conda packages (noarch)
shell: bash -l {0}
# Upload by default on schedule events, and on workflow dispatch only if input upload_conda_binaries is 'true'
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'))
env:
ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_API_TOKEN }}
PREFIX_DEV_TOKEN: ${{ secrets.PREFIX_DEV_TOKEN }}
run: |
cd ${CONDA_BLD_PATH}/noarch/
ls *.conda
anaconda upload --skip-existing *.conda
pixi auth login https://prefix.dev --token $PREFIX_DEV_TOKEN
for condapackage in *.conda; do
pixi upload https://prefix.dev/api/v1/upload/robotology "$condapackage"
done
pixi auth logout https://prefix.dev
# This is disable until we re-enable robot-log-visualizer package
#- name: Upload conda packages (noarch)
# shell: bash -l {0}
# # Upload by default on schedule events, and on workflow dispatch only if input upload_conda_binaries is 'true'
# 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'))
# env:
# ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_API_TOKEN }}
# PREFIX_DEV_TOKEN: ${{ secrets.PREFIX_DEV_TOKEN }}
# run: |
# cd ${CONDA_BLD_PATH}/noarch/
# ls *.conda
# anaconda upload --skip-existing *.conda
# pixi auth login https://prefix.dev --token $PREFIX_DEV_TOKEN
# for condapackage in *.conda; do
# pixi upload https://prefix.dev/api/v1/upload/robotology "$condapackage"
# done
# pixi auth logout https://prefix.dev

# If the generate-conda-packages completed correctly and binaries are uploaded,
# bump automatically the CONDA_BUILD_NUMBER in conda/cmake/CondaGenerationOptions.cmake
Expand Down
5 changes: 4 additions & 1 deletion cmake/Buildwalking-controllers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,7 @@ ycm_ep_helper(walking-controllers TYPE GIT
FOLDER src
DEPENDS ${walking-controllers_DEPENDS})

set(walking-controllers_CONDA_DEPENDENCIES eigen tomlplusplus)
# fmt and spdlog are not direct dependencies but a transitive dep
# via blf, they are added as a workaround for
# https://github.com/robotology/walking-controllers/issues/207
set(walking-controllers_CONDA_DEPENDENCIES eigen tomlplusplus fmt spdlog)
2 changes: 1 addition & 1 deletion conda/cmake/CondaGenerationOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# to ensure that binaries belonging to different rebuilds
# can be distinguished even if the version number is the same
if(NOT CONDA_BUILD_NUMBER)
set(CONDA_BUILD_NUMBER 169)
set(CONDA_BUILD_NUMBER 170)
endif()

# This option is enabled only when the metapackages robotology-distro are
Expand Down
Loading