From 3af99cd3b40bfff0a03fdbf31ebf3d04922d7d8d Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 3 Apr 2024 15:32:31 +0200 Subject: [PATCH 1/6] Constraint pybind11 version to fix conda-forge Windows CI --- .github/workflows/conda-forge-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/conda-forge-ci.yml b/.github/workflows/conda-forge-ci.yml index 0acca37019..fe86acb8cf 100644 --- a/.github/workflows/conda-forge-ci.yml +++ b/.github/workflows/conda-forge-ci.yml @@ -36,10 +36,12 @@ jobs: # Workaround for https://github.com/conda-incubator/setup-miniconda/issues/186 conda config --remove channels defaults # Dependencies + # pybind11 constrained to be <=2.12.0 as a workaround for + # https://github.com/ami-iit/bipedal-locomotion-framework/issues/829 mamba install cmake compilers make ninja pkg-config \ "idyntree>=8.0.0" "yarp>=3.5.0" libmatio libmatio-cpp librobometry \ liblie-group-controllers eigen qhull "casadi>=3.5.5" cppad spdlog \ - nlohmann_json manif manifpy pybind11 numpy pytest scipy opencv pcl \ + nlohmann_json manif manifpy "pybind11<2.12.0" numpy pytest scipy opencv pcl \ tomlplusplus libunicycle-footstep-planner "icub-models>=1.23.4" \ ros-humble-rclcpp onnxruntime-cpp libbayes-filters-lib From 587647ec4bc5cdb3ee468b5a0683f5acccbd0fb5 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 3 Apr 2024 15:51:56 +0200 Subject: [PATCH 2/6] Update conda-forge-ci.yml --- .github/workflows/conda-forge-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-forge-ci.yml b/.github/workflows/conda-forge-ci.yml index fe86acb8cf..90a7ff8317 100644 --- a/.github/workflows/conda-forge-ci.yml +++ b/.github/workflows/conda-forge-ci.yml @@ -41,7 +41,7 @@ jobs: mamba install cmake compilers make ninja pkg-config \ "idyntree>=8.0.0" "yarp>=3.5.0" libmatio libmatio-cpp librobometry \ liblie-group-controllers eigen qhull "casadi>=3.5.5" cppad spdlog \ - nlohmann_json manif manifpy "pybind11<2.12.0" numpy pytest scipy opencv pcl \ + nlohmann_json manif manifpy 'pybind11<2.12.0' numpy pytest scipy opencv pcl \ tomlplusplus libunicycle-footstep-planner "icub-models>=1.23.4" \ ros-humble-rclcpp onnxruntime-cpp libbayes-filters-lib From 32bfb5213964a19f4d52272f93b92f290256b4a6 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 3 Apr 2024 15:54:18 +0200 Subject: [PATCH 3/6] Update conda-forge-ci.yml --- .github/workflows/conda-forge-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-forge-ci.yml b/.github/workflows/conda-forge-ci.yml index 90a7ff8317..36f55a1de2 100644 --- a/.github/workflows/conda-forge-ci.yml +++ b/.github/workflows/conda-forge-ci.yml @@ -38,10 +38,10 @@ jobs: # Dependencies # pybind11 constrained to be <=2.12.0 as a workaround for # https://github.com/ami-iit/bipedal-locomotion-framework/issues/829 - mamba install cmake compilers make ninja pkg-config \ + mamba install cmake compilers make ninja pkg-config "pybind11<2.12.0" \ "idyntree>=8.0.0" "yarp>=3.5.0" libmatio libmatio-cpp librobometry \ liblie-group-controllers eigen qhull "casadi>=3.5.5" cppad spdlog \ - nlohmann_json manif manifpy 'pybind11<2.12.0' numpy pytest scipy opencv pcl \ + nlohmann_json manif manifpy numpy pytest scipy opencv pcl \ tomlplusplus libunicycle-footstep-planner "icub-models>=1.23.4" \ ros-humble-rclcpp onnxruntime-cpp libbayes-filters-lib From f388becdb715785060b9bbd6323a797ccfe5a75b Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 3 Apr 2024 16:15:35 +0200 Subject: [PATCH 4/6] Update conda-forge-ci.yml --- .github/workflows/conda-forge-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conda-forge-ci.yml b/.github/workflows/conda-forge-ci.yml index 36f55a1de2..472dd10673 100644 --- a/.github/workflows/conda-forge-ci.yml +++ b/.github/workflows/conda-forge-ci.yml @@ -38,10 +38,10 @@ jobs: # Dependencies # pybind11 constrained to be <=2.12.0 as a workaround for # https://github.com/ami-iit/bipedal-locomotion-framework/issues/829 - mamba install cmake compilers make ninja pkg-config "pybind11<2.12.0" \ + mamba install cmake compilers make ninja pkg-config \ "idyntree>=8.0.0" "yarp>=3.5.0" libmatio libmatio-cpp librobometry \ liblie-group-controllers eigen qhull "casadi>=3.5.5" cppad spdlog \ - nlohmann_json manif manifpy numpy pytest scipy opencv pcl \ + nlohmann_json manif manifpy pybind11 numpy pytest scipy opencv pcl \ tomlplusplus libunicycle-footstep-planner "icub-models>=1.23.4" \ ros-humble-rclcpp onnxruntime-cpp libbayes-filters-lib @@ -58,10 +58,9 @@ jobs: if: contains(matrix.os, 'windows') shell: bash -l {0} run: | - # Compilation related dependencies mamba install vs2019_win-64 - - name: Remove icub-models and pcl [Windows] + - name: Windows-workarounds [Windows] if: contains(matrix.os, 'windows') shell: bash -l {0} run: | @@ -69,6 +68,8 @@ jobs: # pcl is removed as a workaround for https://github.com/ami-iit/bipedal-locomotion-framework/pull/695#issuecomment-1632208836 # pcl can be re-added once we have a ros humble build compatible with PCL 1.13.0 mamba remove icub-models pcl + # pybind11 constrained as workaround for https://github.com/conda-forge/pybind11-feedstock/issues/95 + mamba install "pybind11<2.12.0" - name: Print used environment shell: bash -l {0} From be0bda32ee4f1690dcd9598c043831f81910a403 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 3 Apr 2024 16:25:02 +0200 Subject: [PATCH 5/6] Update conda-forge-ci.yml --- .github/workflows/conda-forge-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conda-forge-ci.yml b/.github/workflows/conda-forge-ci.yml index 472dd10673..f593a17139 100644 --- a/.github/workflows/conda-forge-ci.yml +++ b/.github/workflows/conda-forge-ci.yml @@ -62,13 +62,13 @@ jobs: - name: Windows-workarounds [Windows] if: contains(matrix.os, 'windows') - shell: bash -l {0} + shell: cmd /C CALL {0} run: | - # Due to this https://github.com/conda-forge/icub-models-feedstock/issues/18 - # pcl is removed as a workaround for https://github.com/ami-iit/bipedal-locomotion-framework/pull/695#issuecomment-1632208836 - # pcl can be re-added once we have a ros humble build compatible with PCL 1.13.0 + :: Due to this https://github.com/conda-forge/icub-models-feedstock/issues/18 + :: pcl is removed as a workaround for https://github.com/ami-iit/bipedal-locomotion-framework/pull/695#issuecomment-1632208836 + :: pcl can be re-added once we have a ros humble build compatible with PCL 1.13.0 mamba remove icub-models pcl - # pybind11 constrained as workaround for https://github.com/conda-forge/pybind11-feedstock/issues/95 + :: pybind11 constrained as workaround for https://github.com/conda-forge/pybind11-feedstock/issues/95 mamba install "pybind11<2.12.0" - name: Print used environment From 8c66a05313c8f78bb516b485ef64c9e193b07dbf Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 4 Apr 2024 09:09:11 +0200 Subject: [PATCH 6/6] Update conda-forge-ci.yml --- .github/workflows/conda-forge-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/conda-forge-ci.yml b/.github/workflows/conda-forge-ci.yml index f593a17139..0df0f1bf98 100644 --- a/.github/workflows/conda-forge-ci.yml +++ b/.github/workflows/conda-forge-ci.yml @@ -36,8 +36,6 @@ jobs: # Workaround for https://github.com/conda-incubator/setup-miniconda/issues/186 conda config --remove channels defaults # Dependencies - # pybind11 constrained to be <=2.12.0 as a workaround for - # https://github.com/ami-iit/bipedal-locomotion-framework/issues/829 mamba install cmake compilers make ninja pkg-config \ "idyntree>=8.0.0" "yarp>=3.5.0" libmatio libmatio-cpp librobometry \ liblie-group-controllers eigen qhull "casadi>=3.5.5" cppad spdlog \ @@ -67,9 +65,9 @@ jobs: :: Due to this https://github.com/conda-forge/icub-models-feedstock/issues/18 :: pcl is removed as a workaround for https://github.com/ami-iit/bipedal-locomotion-framework/pull/695#issuecomment-1632208836 :: pcl can be re-added once we have a ros humble build compatible with PCL 1.13.0 - mamba remove icub-models pcl :: pybind11 constrained as workaround for https://github.com/conda-forge/pybind11-feedstock/issues/95 mamba install "pybind11<2.12.0" + mamba remove icub-models pcl - name: Print used environment shell: bash -l {0}