Update superbuild and superbuild-test

.github/workflows/test.yml

@@ -168,7 +168,7 @@ jobs:
             children_flag: ${{ steps.set-matrix.outputs.children_flag_output }}
             version: ${{ steps.set-matrix.outputs.version }}
 
-    build_and_push_superbuild:
+    build_and_push:
         runs-on: [ubuntu-latest]
         needs: check_files
         if: needs.check_files.outputs.superbuild_flag == 'true'

dockerfile_images/basic/superbuild-icubtest/Dockerfile

@@ -14,6 +14,7 @@ ARG BUILD_TYPE=Release
 ARG CMAKE_EXTRA_OPTIONS=-j4
 ARG release
 ARG sbtag
+ARG metadata
 ARG METADATA_FILE
 
 ENV DEBIAN_FRONTEND=noninteractive

dockerfile_images/basic/superbuild-icubtest/conf_build.ini

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

dockerfile_images/basic/superbuild/Dockerfile

@@ -8,8 +8,12 @@ LABEL maintainer="[email protected], [email protected]"
 
 ARG INSTALL_DIR="/usr/local"
 ARG PROJECTS_DIR=/projects
+ARG CMAKE_GENERATOR="Unix Makefiles"
+ARG BUILD_TYPE=Release
+ARG CMAKE_EXTRA_OPTIONS=-j4
 ARG release="none"
 ARG sbtag="none"
+ARG metadata="none"
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -27,18 +31,9 @@ RUN mkdir -p /etc/bash_completion.d/ && \
         vim &&\
     update-ca-certificates
 
-#Some definitions
-ARG INSTALL_DIR
-ARG PROJECTS_DIR
-ARG CMAKE_GENERATOR="Unix Makefiles"
-ARG BUILD_TYPE=Release
-ARG CMAKE_EXTRA_OPTIONS=-j2
-ARG release
-ARG sbtag
-#RUN if [ "$release" = "Stable" ]; then echo STABLE version is building; elif [ "$release" = "Ustable" ]; then echo UNSTABLE version is building && ${TAG}=Unstable; else echo SPECIFIC version $release is building && branch=$release; fi
-
 RUN echo "DEBUG ==>  Release:" ${release} &&\
-    echo "DEBUG ==>  TAG: " ${tag}
+    echo "DEBUG ==>  TAG: " ${tag} &&\
+    echo "DEBUG ==>  metadata: " ${metadata}
 
 # Setup entrypoint
 ARG ROBOTOLOGY_INITIALIZATION_FILE=/usr/local/bin/setup_robotology_tdd.sh
@@ -81,7 +76,7 @@ ARG PROJECTS_DIR
 ARG METADATA_FILE
 ARG release
 ARG sbtag
-ARG metadata="none"
+ARG metadata
 
 COPY --from=builder ${PROJECTS_DIR} ${PROJECTS_DIR}
 COPY --from=builder /usr /usr