Skip to content

Commit

Permalink
macOS conda package generation: Pin gazebo and opencv and do not gene…
Browse files Browse the repository at this point in the history
…rate metapackages (#1049)
  • Loading branch information
traversaro authored Mar 1, 2022
1 parent 8c6e4bd commit cce2036
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/generate-conda-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ jobs:
rm -rf human-dynamics-estimation
conda build -m ${CONDA_PREFIX}/conda_build_config.yaml -m ${GITHUB_WORKSPACE}/conda/conda_build_config.yml .
- name: Build conda metapackages (if necessary
if: github.event_name == 'release'
- name: Build conda metapackages (if necessary)
if: github.event_name == 'release' && !contains(matrix.os, 'macos')
shell: bash -l {0}
run: |
cd build/conda/generated_recipes_metapackages
Expand Down
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 43)
set(CONDA_BUILD_NUMBER 44)
endif()

# This option is enabled only when the metapackages robotology-distro and robotology-distro-all are
Expand Down
6 changes: 6 additions & 0 deletions conda/conda_build_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ pin_run_as_build:
qt:
- "5.12.9=*_4"

gazebo: # [osx]
- '11.9' # [osx]

libopencv: # [osx]
- '4.5.3' # [osx]

cmake:
- '3.21'

0 comments on commit cce2036

Please sign in to comment.