Update superbuild base, withuser and robometry images to check fix on…

… superbuidl with robometry compilation

.github/workflows/test.yml

@@ -374,8 +374,8 @@ jobs:
               id: get_workflow_token
               uses: tibdex/github-app-token@v2
               with:
-                private_key: ${{ secrets.ICUB_TECH_IIT_APP_KEY }}
                 app_id: ${{ secrets.ICUB_TECH_IIT_APP_ID }}
+                private_key: ${{ secrets.ICUB_TECH_IIT_APP_KEY }}
                 installation_retrieval_mode: repository
                 installation_retrieval_payload: icub-tech-iit/code
             # this step ensures that the children are built with the "release" version, which is used when the "repository_trigger" is sent

dockerfile_images/basic/superbuild-icubhead-robometry/Dockerfile

@@ -48,6 +48,7 @@ RUN cd ${PROJECTS_DIR}/robotology-superbuild &&\
     cd build &&\
     cmake .. \
     -G "$CMAKE_GENERATOR" \
+        -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
         -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
         -DNON_INTERACTIVE_BUILD:BOOL=ON \
         -DROBOTOLOGY_ENABLE_CORE:BOOL=ON \
@@ -58,10 +59,9 @@ RUN cd ${PROJECTS_DIR}/robotology-superbuild &&\
         -DROBOTOLOGY_USES_GAZEBO=OFF \
         -DROBOTOLOGY_PROJECT_TAGS=${sbtag} \
         -DYCM_EP_INSTALL_DIR=${INSTALL_DIR} \
-        -DENABLE_yarpmod_grabber:BOOL=ON \
+        -DYCM_USE_CMAKE_PROPOSED=ON \ 
         &&\
         # Build all the projects
-        cmake --build . --target update-all -- ${CMAKE_EXTRA_OPTIONS} &&\
         cmake --build . -- ${CMAKE_EXTRA_OPTIONS}
 
 FROM scratch

dockerfile_images/basic/superbuild-icubhead-robometry/conf_build.ini

@@ -1,6 +1,6 @@
 [sources]
 SOURCE_IMG={{env.REGISTRY}}/{{env.REPOSITORY_NAME}}/{{env.IMAGE_PREFIX}}superbuild-icubhead-withuser:{{steps.get_version.outputs.VERSION}}{{steps.get_version.outputs.TAG}}_sources
-metadata=$(cat DATE_TAG)
+metadata={{steps.get_date.outputs.DATE_HOUR}}
 release={{steps.get_version.outputs.VERSION}}
 sbtag={{matrix.tag}}
 

dockerfile_images/basic/superbuild-icubhead-withuser/Dockerfile

@@ -1,12 +1,5 @@
 #start from image passed by argument during build process. Usually it is an ubuntu image plus mesa library.
 ARG START_IMG="none"
-ARG INSTALL_DIR=/home/icub/install_dir
-ARG PROJECTS_DIR=/home/icub/projects
-ARG METADATA_FILE=/home/icub/install_dir/bin/setup_metadata.sh
-ARG ROBOTOLOGY_INITIALIZATION_FILE=/usr/local/bin/setup_robotology_tdd.sh
-ARG release="none"
-ARG sbtag="none"
-ARG metadata="none"
 
 ARG HOME_DIR=/home/icub
 ARG INSTALL_DIR=${HOME_DIR}/install_dir
@@ -66,7 +59,7 @@ RUN sudo chown -R icub: /usr/local/bin/setup_robotology_tdd.sh
 #Some definitions
 ARG CMAKE_GENERATOR="Unix Makefiles"
 ARG BUILD_TYPE=Release
-ARG CMAKE_EXTRA_OPTIONS=-j2
+ARG CMAKE_EXTRA_OPTIONS=-j4
 
 #ENV DEBIAN_FRONTEND=noninteractive is not sufficient
 RUN echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections &&\
@@ -78,27 +71,26 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-sel
     mkdir build && cd build &&\
       cmake .. \
         -G "$CMAKE_GENERATOR" \
+        -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
         -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
         -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 \
+        # -DENABLE_yarpmod_grabber:BOOL=ON \
        &&\
     #Build all the projects &&\
-    cmake --build . --target update-all -- ${CMAKE_EXTRA_OPTIONS} &&\
+    # cmake --build . --target update-all -- ${CMAKE_EXTRA_OPTIONS} &&\
     cmake --build . -- ${CMAKE_EXTRA_OPTIONS}
 
 FROM scratch 
 
 ARG PROJECTS_DIR
 ARG CMAKE_GENERATOR="Unix Makefiles"
 ARG BUILD_TYPE=Release
-ARG CMAKE_EXTRA_OPTIONS=-j2
+ARG CMAKE_EXTRA_OPTIONS=-j4
 ARG INSTALL_DIR
 ARG release
 ARG sbtag
@@ -115,19 +107,6 @@ COPY --from=builder / /
 # # in the superbuild.
 ENV CMAKE_PREFIX_PATH=${INSTALL_DIR}
 
-#add checkRobotInterface
-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 ${INSTALL_DIR}/bin
-
-
 #The EXPOSE instruction does not actually publish the port.
 #It functions as a type of documentation between the person who builds the image and the person who runs the container, about which ports are intended to be published.
 #To actually publish the port when running the container, use the -p flag on docker run to publish and map one or more ports, or the -P flag to publish all exposed ports and map them to high-order ports.

dockerfile_images/basic/superbuild/Dockerfile

@@ -1,15 +1,12 @@
 #start from image passed by argument during build process. Usually it is an ubuntu image plus mesa library.
 ARG START_IMG="none"
-ARG ROBOTOLOGY_INITIALIZATION_FILE=/usr/local/bin/setup_robotology_tdd.sh
-ARG METADATA_FILE=/usr/local/bin/setup_metadata.sh
-ARG INSTALL_DIR=/usr/local
+ARG INSTALL_DIR="/usr/local"
+ARG METADATA_FILE="/usr/local/bin/setup_metadata.sh"
 ARG PROJECTS_DIR=/projects
-ARG release="none"
-ARG sbtag="none"
-ARG metadata="none"
+ARG release="master"
+ARG sbtag="Stable"
 
-# Stage 1: builder stage
-FROM $START_IMG AS builder
+FROM $START_IMG as builder
 
 LABEL maintainer="[email protected], [email protected]"
 

dockerfile_images/basic/superbuild/conf_build.ini

@@ -1,6 +1,7 @@
 [sources]
 START_IMG=ubuntu:jammy
-metadata={{steps.get_date.outputs.DATE_HOUR}}
+; metadata={{steps.get_date.outputs.DATE_HOUR}}
+metadata=$(cat DATE_TAG)
 release={{steps.get_version.outputs.VERSION}}
 sbtag={{matrix.tag}}