Merge pull request #573 from norlab-ulaval/fix-build-system-standand-…

…alone-dependencies-installer ci: minor mod to dependencies installer
norlab-ulaval · Jun 6, 2024 · 0edf664 · 0edf664
2 parents 67837fe + ca12686
commit 0edf664
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 15 deletions.
diff --git a/build_system/.jetbrains_run_config/[LPM] run all bats tests.run.xml b/build_system/.jetbrains_run_config/[LPM] run all bats tests.run.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="true" />
     <envs>
       <env name="DOCKER_CONTEXT" value="desktop-linux" />

diff --git a/...config/bash lpm_execute_compose_over_build_matrix.bash › build _service_ _popup_.run.xml b/...config/bash lpm_execute_compose_over_build_matrix.bash › build _service_ _popup_.run.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs>
       <env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />

diff --git a/...ompose_over_build_matrix.bash › build dependencies_arm64v8 ci_PR_arm64v8 _popup_.run.xml b/...ompose_over_build_matrix.bash › build dependencies_arm64v8 ci_PR_arm64v8 _popup_.run.xml
@@ -9,11 +9,11 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs>
       <env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
     </envs>
     <method v="2" />
   </configuration>
-</component>
+</component>
diff --git a/...build_matrix.bash › build dependencies-general dependencies (BUILD MATRIX SUBSET).run.xml b/...build_matrix.bash › build dependencies-general dependencies (BUILD MATRIX SUBSET).run.xml
@@ -9,11 +9,11 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs>
       <env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
     </envs>
     <method v="2" />
   </configuration>
-</component>
+</component>
diff --git a/...h lpm_execute_compose_over_build_matrix.bash › build test_compilation__ (Release).run.xml b/...h lpm_execute_compose_over_build_matrix.bash › build test_compilation__ (Release).run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="bash lpm_crawl_libpointmatcher_build_matrix.bash › build test_compilation_* (compilation test)" type="ShConfigurationType" folderName="[LPM] C | Execute compose over build matrix">
-    <option name="SCRIPT_TEXT" value="bash lpm_crawl_libpointmatcher_build_matrix.bash --fail-fast --cmake-build-type-build-matrix-override Release --os-name-build-matrix-override ubuntu --ubuntu-version-build-matrix-override jammy -- build test_compilation_prefixed_path test_compilation_auto_path_resolution" />
+    <option name="SCRIPT_TEXT" value="bash lpm_crawl_libpointmatcher_build_matrix.bash --fail-fast --cmake-build-type-build-matrix-override Release --os-name-build-matrix-override ubuntu --ubuntu-version-build-matrix-override focal -- build test_compilation_prefixed_path test_compilation_auto_path_resolution" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs>
       <env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />

diff --git a/...er_build_matrix.bash › build test_compilation_prefixed_path (BUILD MATRIX SUBSET).run.xml b/...er_build_matrix.bash › build test_compilation_prefixed_path (BUILD MATRIX SUBSET).run.xml
@@ -9,11 +9,11 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs>
       <env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />
     </envs>
     <method v="2" />
   </configuration>
-</component>
+</component>
diff --git a/..._over_build_matrix.bash › build&push dependencies-general dependencies (AS IN TC).run.xml b/..._over_build_matrix.bash › build&push dependencies-general dependencies (AS IN TC).run.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs>
       <env name="BUILDX_BUILDER" value="local-builder-multiarch-virtual" />

diff --git a/build_system/.jetbrains_run_config/test_execute_compose_over_build_matrix.bash.run.xml b/build_system/.jetbrains_run_config/test_execute_compose_over_build_matrix.bash.run.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs />
     <method v="2" />

diff --git a/...ystem/.jetbrains_run_config/test_execute_compose_over_build_matrix_with_flag.bash.run.xml b/...ystem/.jetbrains_run_config/test_execute_compose_over_build_matrix_with_flag.bash.run.xml
@@ -9,7 +9,7 @@
     <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
     <option name="INTERPRETER_PATH" value="/bin/zsh" />
     <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs />
     <method v="2" />

diff --git a/build_system/tests/tests_docker_interactive/Dockerfile.build_system_test b/build_system/tests/tests_docker_interactive/Dockerfile.build_system_test
@@ -1,5 +1,6 @@
 ARG BASE_IMAGE=ubuntu
-ARG BASE_IMAGE_TAG=jammy
+#ARG BASE_IMAGE_TAG=jammy
+ARG BASE_IMAGE_TAG=bionic
 FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS base-image
 
 LABEL org.opencontainers.image.authors="[email protected]"

diff --git a/build_system/ubuntu/lpm_install_dependencies_general_ubuntu.bash b/build_system/ubuntu/lpm_install_dependencies_general_ubuntu.bash
@@ -20,16 +20,19 @@ TMP_CWD=$(pwd)
 LPM_PATH=$(git rev-parse --show-toplevel)
 cd "${LPM_PATH}/build_system" || cd "${LPM_PATH}" || exit 1
 
+NBS_PATH=${NBS_PATH:-"${LPM_PATH}/build_system/utilities/norlab-build-system"}
+N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
+
 # ....Load environment variables from file.........................................................
 set -o allexport
 source .env
 set +o allexport
 
 # ....Helper function..............................................................................
 # import shell functions from utilities library
-N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
 source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash"
 
+
 # Set environment variable IMAGE_ARCH_AND_OS
 cd "${N2ST_PATH}"/src/utility_scripts/ && source "which_architecture_and_os.bash"
 

diff --git a/build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash b/build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash
@@ -218,6 +218,10 @@ if [[ $TEST_RUN  == true ]]; then
   BUILD_EXIT_CODE=0
   INSTALL_EXIT_CODE=0
 else
+  #  # Hack to prevent LPM cmake build failure in ubuntu bionic
+  #  BOOST_ROOT=$(whereis boost) && export BOOST_ROOT
+  #  CMAKE_FLAGS=( -D BOOST_ROOT="$BOOST_ROOT" "${CMAKE_FLAGS[@]}" )
+
   cmake "${CMAKE_FLAGS[@]}" "${NBS_LIB_INSTALL_PATH}/${NBS_REPOSITORY_NAME}"
 
   BUILD_EXIT_CODE=$?