From fb9e0f6c03c8839c9ba2e7e7876fef589cea8547 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 12 Jan 2023 15:32:05 +0100 Subject: [PATCH] Remove legacy workarounds in conda-forge GitHub Actions job (#3270) In https://github.com/gazebosim/gazebo-classic/pull/3223#issuecomment-1140038513 we added some workarounds for the conda-forge CI, namely pin the version of some dependencies and removed dartsim. Now that the long term fixes to that problems (linked in https://github.com/gazebosim/gazebo-classic/pull/3223#issuecomment-1140038513) has been fixed, we can remove the workarounds. --- .github/workflows/conda-forge.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/conda-forge.yml b/.github/workflows/conda-forge.yml index a2e7b4aa87..dec8853621 100644 --- a/.github/workflows/conda-forge.yml +++ b/.github/workflows/conda-forge.yml @@ -37,9 +37,7 @@ jobs: # Compilation related dependencies mamba install cmake compilers make ninja pkg-config # Actual dependencies - # re-add dartsim once the libsdformat 9.8 issue is resolved - # https://github.com/osrf/gazebo/pull/3223#issuecomment-1140019713 - mamba install libprotobuf libsdformat libignition-cmake2 libignition-math6 libignition-transport8 libignition-common3 libignition-fuel-tools4 qt=5.12.9=*_4 ogre=1.10 freeimage curl tbb-devel qwt tinyxml2 libccd boost-cpp libcurl tinyxml bzip2 zlib ffmpeg graphviz libgdal libusb bullet-cpp simbody hdf5 openal-soft glib gts + mamba install libprotobuf libsdformat libignition-cmake2 libignition-math6 libignition-transport8 libignition-common3 libignition-fuel-tools4 qt-main ogre=1.10 freeimage curl tbb-devel qwt tinyxml2 libccd boost-cpp libcurl tinyxml bzip2 zlib ffmpeg graphviz libgdal libusb bullet-cpp simbody hdf5 openal-soft glib gts dartsim - name: Linux-only Dependencies [Linux] if: contains(matrix.os, 'ubuntu')