diff --git a/.github/workflows/build_and_publish_docker.yaml b/.github/workflows/build_and_publish_docker.yaml index 2a1dedf..1cf5fc1 100644 --- a/.github/workflows/build_and_publish_docker.yaml +++ b/.github/workflows/build_and_publish_docker.yaml @@ -3,6 +3,7 @@ name: build and publish docker images on: workflow_dispatch: + pull_request: schedule: - cron: '0 0 * * FRI' diff --git a/Dockerfile.debian11 b/Dockerfile.debian11 index ad19c9e..75606dc 100644 --- a/Dockerfile.debian11 +++ b/Dockerfile.debian11 @@ -79,19 +79,8 @@ ENV ROS_DISTRO=${ROS_DISTRO:-rolling} # https://github.com/osrf/docker_images/blob/master/ros/iron/ubuntu/jammy/ros-base/Dockerfile # install bootstrap tools - -# there is a broken package python3-colcon-notification, lets install the fix first and then install python3-colcon-common-extensions -# https://github.com/colcon/colcon-notification/issues/63#issuecomment-1823763950 -#TODO(christophfroehlich): remove this fix when the package is fixed -COPY install_colcon_fix.sh /tmp/ -RUN apt-get update && \ - . /tmp/install_colcon_fix.sh && \ - apt-get install --no-install-recommends -y python3-colcon-common-extensions \ - && rm -rf /var/lib/apt/lists/* - RUN apt-get update && apt-get install --no-install-recommends -y \ - # python3-colcon-common-extensions \ # there is a broken package python3-colcon-notification, use fix from above or install the others manually from next line - # python3-colcon-cmake python3-colcon-core python3-colcon-defaults python3-colcon-devtools python3-colcon-library-path python3-colcon-metadata python3-colcon-output python3-colcon-package-information python3-colcon-package-selection python3-colcon-parallel-executor python3-colcon-powershell python3-colcon-python-setup-py python3-colcon-recursive-crawl python3-colcon-ros python3-colcon-test-result python3-colcon-argcomplete python3-colcon-bash python3-colcon-cd python3-colcon-override-check \ + python3-colcon-common-extensions \ python3-colcon-mixin \ python3-rosdep \ python3-vcstool \ diff --git a/install_colcon_fix.sh b/install_colcon_fix.sh deleted file mode 100755 index 7083ffd..0000000 --- a/install_colcon_fix.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -apt-get install --no-install-recommends -y zstd xz-utils binutils -mkdir -p /tmp/colcon_fix/ -cd /tmp/colcon_fix -apt-get download python3-colcon-notification -# Extract files from the archive -ar x python3-colcon-notification* -rm python3-colcon-notification* -# Uncompress zstd files an re-compress them using xz -zstd -d < control.tar.zst | xz > control.tar.xz -zstd -d < data.tar.zst | xz > data.tar.xz -# Re-create the Debian package in /tmp/ -ar -m -c -a sdsd python3-colcon-notification_new.deb debian-binary control.tar.xz data.tar.xz -# Clean up (optional) -rm debian-binary control.tar.xz data.tar.xz control.tar.zst data.tar.zst -# install -apt-get install --no-install-recommends -y ./python3-colcon-notification_new.deb \ No newline at end of file