diff --git a/.github/workflows/catkin_build.yml b/.github/workflows/catkin_build.yml index 064a963..a3dcba7 100644 --- a/.github/workflows/catkin_build.yml +++ b/.github/workflows/catkin_build.yml @@ -15,6 +15,7 @@ jobs: # 1. Install basic requirements - run: apt-get update && apt-get install -y git - run: if [[ "$ROS_DISTRO" = "noetic" ]] ; then apt-get install -y python3-pip ros-noetic-catkin python3-catkin-tools ; fi + - run: pip install setuptools==68.0.0 importlib-metadata==8.2.0 # hack because there is an issue on >=71.0.0 https://github.com/pypa/setuptools/issues/4478 # 2. Checkout repo with submodules - uses: actions/checkout@v2 diff --git a/Dockerfile b/Dockerfile index 21e8191..6018e37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,12 @@ WORKDIR /catkin_ws/src/uav_hitl_simulator # 1. Install basic requirements RUN apt-get update && \ apt-get upgrade -y && \ - apt-get install -y git ros-$ROS_DISTRO-catkin python3-pip python3-catkin-tools + apt-get install -y git ros-$ROS_DISTRO-catkin python3-pip + +# hack because there is an issue on >=71.0.0 https://github.com/pypa/setuptools/issues/4478 +RUN pip install setuptools==68.0.0 importlib-metadata==8.2.0 +RUN apt-get install -y python3-catkin-tools + RUN if [[ "$ROS_DISTRO" = "melodic" ]] ; then apt-get install -y python-pip python-catkin-tools ; fi # 2. Install requirements