From 340efd94ebd59aa47dedc4fdb5179690a93c6f37 Mon Sep 17 00:00:00 2001 From: Jacopo Date: Mon, 23 Dec 2024 11:47:04 +0100 Subject: [PATCH] Check updates add in open PR --- .github/workflows/test.yml | 1 + .../basic/superbuild-icubhead-robometry/Dockerfile | 1 - .../basic/superbuild-icubhead/Dockerfile | 5 +---- .../basic/superbuild-icubtest/Dockerfile | 3 +-- dockerfile_images/basic/superbuild-ros2/Dockerfile | 4 ++-- dockerfile_images/basic/superbuild/Dockerfile | 13 ------------- dockerfile_images/basic/superbuild/conf_build.ini | 3 +-- 7 files changed, 6 insertions(+), 24 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c371345..22b2bac 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -66,6 +66,7 @@ jobs: then element=$(echo $i | awk -F'/' '{print $3}' | tr -d '"' | tr -d '[' | tr -d ']') image_path=dockerfile_images/$(echo $i | awk -F'/' '{print $2}' | tr -d '"' | tr -d '[' | tr -d ']') + echo "this is image_path as requested: $image_path" element_flag=false children_flag=false children_image_flag=false diff --git a/dockerfile_images/basic/superbuild-icubhead-robometry/Dockerfile b/dockerfile_images/basic/superbuild-icubhead-robometry/Dockerfile index 955be7a..fae166d 100644 --- a/dockerfile_images/basic/superbuild-icubhead-robometry/Dockerfile +++ b/dockerfile_images/basic/superbuild-icubhead-robometry/Dockerfile @@ -61,7 +61,6 @@ RUN cd ${PROJECTS_DIR}/robotology-superbuild &&\ -DROBOTOLOGY_USES_GAZEBO=OFF \ -DROBOTOLOGY_PROJECT_TAGS=${sbtag} \ -DFETCHCONTENT_QUIET:BOOL=ON \ - #-DYCM_DIR=${INSTALL_DIR}/share/YCM \ -DYCM_USE_CMAKE_PROPOSED=ON \ &&\ # Build all the projects diff --git a/dockerfile_images/basic/superbuild-icubhead/Dockerfile b/dockerfile_images/basic/superbuild-icubhead/Dockerfile index 8cb218f..a7b6a62 100644 --- a/dockerfile_images/basic/superbuild-icubhead/Dockerfile +++ b/dockerfile_images/basic/superbuild-icubhead/Dockerfile @@ -44,7 +44,7 @@ COPY setup.sh ${ROBOTOLOGY_INITIALIZATION_FILE} RUN mkdir ${PROJECTS_DIR} && cd ${PROJECTS_DIR} &&\ git clone https://github.com/robotology/robotology-superbuild.git &&\ cd robotology-superbuild &&\ - git checkout ${release} -b ${release}_branch &&\ + git checkout ${release} &&\ ./scripts/install_apt_dependencies.sh &&\ mkdir build && cd build &&\ cmake .. \ @@ -53,15 +53,12 @@ RUN mkdir ${PROJECTS_DIR} && cd ${PROJECTS_DIR} &&\ -DNON_INTERACTIVE_BUILD:BOOL=ON \ -DROBOTOLOGY_ENABLE_CORE:BOOL=ON \ -DROBOTOLOGY_ENABLE_ICUB_HEAD:BOOL=ON \ - -DROBOTOLOGY_ENABLE_DYNAMICS:BOOL=ON \ -DYCM_USE_DEPRECATED:BOOL=OFF \ -DROBOTOLOGY_USES_GAZEBO=OFF \ -DROBOTOLOGY_PROJECT_TAGS=${sbtag} \ -DYCM_EP_INSTALL_DIR=${INSTALL_DIR} \ - -DENABLE_yarpmod_grabber:BOOL=ON \ &&\ # Build all the projects - cmake --build . --target update-all -- -j4 &&\ cmake --build . -- ${CMAKE_EXTRA_OPTIONS} # Executing commands in chain makes compilation faster diff --git a/dockerfile_images/basic/superbuild-icubtest/Dockerfile b/dockerfile_images/basic/superbuild-icubtest/Dockerfile index e2476ef..21ec618 100644 --- a/dockerfile_images/basic/superbuild-icubtest/Dockerfile +++ b/dockerfile_images/basic/superbuild-icubtest/Dockerfile @@ -9,7 +9,7 @@ ARG sbtag="none" ARG metadata="none" # Stage 1: build stage -FROM $SOURCE_IMG as builder +FROM $SOURCE_IMG AS builder LABEL maintainer="valentina.gaggero@iit.it, jacopo.losi@iit.it" @@ -57,7 +57,6 @@ RUN cd ${PROJECTS_DIR}/robotology-superbuild &&\ -DYCM_EP_INSTALL_DIR=${INSTALL_DIR} \ &&\ # Build all the projects - cmake --build . --target update-all -- -j4 &&\ cmake --build . -- ${CMAKE_EXTRA_OPTIONS} # Stage 2: scratch stage diff --git a/dockerfile_images/basic/superbuild-ros2/Dockerfile b/dockerfile_images/basic/superbuild-ros2/Dockerfile index 8ceac69..f1e09be 100644 --- a/dockerfile_images/basic/superbuild-ros2/Dockerfile +++ b/dockerfile_images/basic/superbuild-ros2/Dockerfile @@ -12,8 +12,8 @@ ARG ROS_DISTRO=humble #ARG SUPERBUILD_IMG=icubteamcode/superbuild-icubhead:master-unstable_sources ARG PROJECTS_DIR=/projects -FROM $START_IMG as superbuild_builder -FROM $ROS_IMG as ros_builder +FROM $START_IMG AS superbuild_builder +FROM $ROS_IMG AS ros_builder ENV DEBIAN_FRONTEND=noninteractive diff --git a/dockerfile_images/basic/superbuild/Dockerfile b/dockerfile_images/basic/superbuild/Dockerfile index db56a9d..00d5281 100644 --- a/dockerfile_images/basic/superbuild/Dockerfile +++ b/dockerfile_images/basic/superbuild/Dockerfile @@ -76,19 +76,6 @@ RUN mkdir ${PROJECTS_DIR} && cd ${PROJECTS_DIR} &&\ # This steps should theoretically help cleaning unecessary post-build files that are already installed and that can be eventually re-generated RUN rm -rf ${PROJECTS_DIR}/robotology-superbuild/build/src &&\ echo "source ${INSTALL_DIR}/share/robotology-superbuild/setup.sh" >> $ROBOTOLOGY_INITIALIZATION_FILE - - -# Do we still need this repo from appsAway?? -# RUN cd ${PROJECTS_DIR} && \ -# git clone https://github.com/icub-tech-iit/appsAway.git && \ -# cd appsAway/modules/checkRobotInterface && \ -# mkdir build && cd build && \ -# cmake .. \ -# -G "$CMAKE_GENERATOR" \ -# -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ -# &&\ -# cmake --build . -- ${CMAKE_EXTRA_OPTIONS} && \ -# cp ./checkRobotInterface /usr/local/bin # Stage 2: secondstage stage FROM $START_IMG AS secondstage diff --git a/dockerfile_images/basic/superbuild/conf_build.ini b/dockerfile_images/basic/superbuild/conf_build.ini index 112d316..6ad7b88 100644 --- a/dockerfile_images/basic/superbuild/conf_build.ini +++ b/dockerfile_images/basic/superbuild/conf_build.ini @@ -1,7 +1,6 @@ [sources] START_IMG=ubuntu:jammy -; metadata={{steps.get_date.outputs.DATE_HOUR}} -metadata=$(cat DATE_TAG) +metadata={{steps.get_date.outputs.DATE_HOUR}} release={{steps.get_version.outputs.VERSION}} sbtag={{matrix.tag}}