ci: update submodule to latest and mod service for docker-container d…

…river
norlab-ulaval · Mar 22, 2024 · be1fdbe · be1fdbe
1 parent 4d3be8f
commit be1fdbe
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/build_system/docker-compose.libnabo.yaml b/build_system/docker-compose.libnabo.yaml
@@ -11,12 +11,12 @@ services:
     build:
       context: ..
       dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR:?err}/ubuntu/Dockerfile.libnabo.integration_test
-      no_cache: true
+      no_cache: false
       target: integration-test-compile-auto-path-resolution
-      ## Mute 'platforms' while using arch virtualization with C++ build to prevent segmentation fault during nabo cmake install
-#      platforms:
-#        - "linux/amd64"
-#        - "linux/arm64/v8"
+      # Mute 'platforms' while using arch virtualization with C++ build to prevent segmentation fault during nabo cmake install
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64/v8"
       args:
         PROJECT_HUB: ${NBS_DOCKERHUB_NAMESPACE}
         BASE_IMAGE: libnabo-dependencies
@@ -50,7 +50,7 @@ services:
     build:
       context: ..
       dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/ubuntu/Dockerfile.libnabo.ci_PR
-      no_cache: true
+      no_cache: false
       args:
         PROJECT_HUB: ${NBS_DOCKERHUB_NAMESPACE}
         BASE_IMAGE: libnabo-dependencies
@@ -69,11 +69,23 @@ services:
     build:
       platforms:
         - "linux/amd64"
-  ci_PR_arm64v8:
+    depends_on:
+      - ci_PR
+  ci_PR_arm64:
     extends: ci_PR
     build:
       platforms:
-        - "linux/arm64/v8"
+        - "linux/arm64"
+    depends_on:
+      - ci_PR
+  ci_PR_multiarch:
+    extends: ci_PR
+    build:
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
+    depends_on:
+      - ci_PR
 
   # ====Dockerhub release image====================================================================
   release:
@@ -85,7 +97,7 @@ services:
       platforms:
         - "linux/amd64"
         - "linux/arm64/v8"
-      no_cache: true
+      no_cache: false
       args:
         PROJECT_HUB: ${NBS_DOCKERHUB_NAMESPACE}
         BASE_IMAGE: libnabo-dependencies-doc

diff --git a/build_system/utilities/norlab-build-system b/build_system/utilities/norlab-build-system
diff --git a/build_system/utilities/norlab-shell-script-tools b/build_system/utilities/norlab-shell-script-tools
+1 −1		.github/workflows/semantic_release.yml
+1 −0		.gitmodules
+79 −0		CHANGELOG.md
+21 −13		README.md
+1 −1		build_system_templates/.env.build_matrix.dependencies.template
+1 −1		build_system_templates/.env.build_matrix.project.template
+32 −27		build_system_templates/docker-compose.project_core.yaml
+280 −0		build_system_templates/installer/nbs_cmake_install_ubuntu.bash
+10 −3		build_system_templates/nbs_container/project-core/Dockerfile.project.ci_PR
+64 −0		build_system_templates/nbs_container/project-core/Dockerfile.project.hub_release
+12 −8		build_system_templates/nbs_container/project-core/entrypoint.bash
+3 −0		import_norlab_build_system_lib.bash
+20 −2		src/function_library/build_tools/execute_compose.bash
+42 −19		src/utility_scripts/nbs_execute_compose_over_build_matrix.bash
+2 −2		src/utility_scripts/nbs_install_python_dev_tools.bash
+15 −3		src/utility_scripts/nbs_run_all_test_and_dryrun_in_directory.bash
+26 −0		tests/tests_bats/tests_function_library/tests_build_tools/test_execute_compose.bats
+137 −0		tests/tests_bats/tests_installer/test_build_system_cmake_installer.bats
+48 −3		tests/tests_bats/tests_utility_script/test_execute_compose_over_build_matrix.bats
+2 −2		tests/tests_bats/tests_utility_script/test_nbs_install_python_dev_tools.bats
+3 −3		tests/tests_docker_build/test_build_nbs_crawl_dependencies_build_matrix.bash
+4 −3		tests/tests_docker_build/test_build_nbs_crawl_project_build_matrix.bash
+4 −3		tests/tests_docker_dryrun_and_config/dryrun_nbs_crawl_dependencies_build_matrix.bash
+4 −3		tests/tests_docker_dryrun_and_config/dryrun_nbs_crawl_project_build_matrix.bash
+4 −3		tests/tests_docker_dryrun_and_config/test_config_nbs_crawl_dependencies_build_matrix.bash
+4 −3		tests/tests_docker_dryrun_and_config/test_config_nbs_crawl_project_build_matrix.bash
+1 −1		utilities/norlab-shell-script-tools
+1 −1		version.txt
+1 −1		.github/workflows/semantic_release.yml
+47 −0		CHANGELOG.md
+21 −13		README.md
+5 −2		src/function_library/general_utilities.bash
+2 −0		tests/bats_testing_tools/Dockerfile.bats-core-code-isolation.alpine
+3 −0		tests/bats_testing_tools/Dockerfile.bats-core-code-isolation.ubuntu
+43 −0		tests/bats_testing_tools/bats_helper_functions.bash
+3 −0		tests/bats_testing_tools/run_bats_tests_in_docker.bash
+3 −0		tests/test_general_utilities.bats
+1 −1		version.txt