From 1f021cdd95a5c0b3224b2b9fc67a9ce011e437d0 Mon Sep 17 00:00:00 2001 From: RedLeaderOne Date: Mon, 11 Dec 2023 07:01:07 -0500 Subject: [PATCH 1/4] fix: build system path passed through a environment variable --- build_system/docker-compose.dependencies.yaml | 4 ++-- build_system/docker-compose.libpointmatcher.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build_system/docker-compose.dependencies.yaml b/build_system/docker-compose.dependencies.yaml index c88e8389..cc364c67 100644 --- a/build_system/docker-compose.dependencies.yaml +++ b/build_system/docker-compose.dependencies.yaml @@ -6,7 +6,7 @@ services: build: target: libpointmatcher-dependencies-general context: .. - dockerfile: ./build_system/ubuntu/Dockerfile.dependencies + dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR:?err}/ubuntu/Dockerfile.dependencies platforms: - "linux/amd64" - "linux/arm64/v8" @@ -33,7 +33,7 @@ services: image: ${NBS_DOCKERHUB_NAMESPACE:?err}/libpointmatcher-dependencies-doc:${NBS_IMAGE_TAG:?err} build: context: .. - dockerfile: ./build_system/ubuntu/Dockerfile.dependencies.doxygen + dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR:?err}/ubuntu/Dockerfile.dependencies.doxygen platforms: - "linux/amd64" - "linux/arm64/v8" diff --git a/build_system/docker-compose.libpointmatcher.yaml b/build_system/docker-compose.libpointmatcher.yaml index 4db35b1a..487192f2 100644 --- a/build_system/docker-compose.libpointmatcher.yaml +++ b/build_system/docker-compose.libpointmatcher.yaml @@ -10,7 +10,7 @@ services: pull_policy: build build: context: .. - dockerfile: ubuntu/Dockerfile.libpointmatcher.compilation_test + dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR:?err}/ubuntu/Dockerfile.libpointmatcher.compilation_test target: test-compilation-auto-path-resolution ## Mute 'platforms' while using arch virtualization with C++ build to prevent segmentation fault during lpm cmake install # platforms: @@ -48,7 +48,7 @@ services: pull_policy: build build: context: .. - dockerfile: ubuntu/Dockerfile.libpointmatcher.ci_PR + dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/ubuntu/Dockerfile.libpointmatcher.ci_PR no_cache: true args: PROJECT_HUB: ${NBS_DOCKERHUB_NAMESPACE} @@ -80,7 +80,7 @@ services: pull_policy: build build: context: .. - dockerfile: ubuntu/Dockerfile.libpointmatcher.ci_SITREP_matrix + dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/ubuntu/Dockerfile.libpointmatcher.ci_SITREP_matrix no_cache: true args: PROJECT_HUB: ${NBS_DOCKERHUB_NAMESPACE} @@ -106,7 +106,7 @@ services: container_name: libpointmatcher build: context: .. - dockerfile: ubuntu/Dockerfile.libpointmatcher.hub_release + dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/ubuntu/Dockerfile.libpointmatcher.hub_release platforms: - "linux/amd64" - "linux/arm64/v8" From 2111244710fab36fe2f04094ba0dabb39e411214 Mon Sep 17 00:00:00 2001 From: RedLeaderOne Date: Mon, 11 Dec 2023 07:39:04 -0500 Subject: [PATCH 2/4] fix: path to script for test run in docker container --- ...2 lpm_execute_compose.bash -- build.run.xml" | 17 ----------------- ...bash \342\200\272 test flag (popup).run.xml" | 17 ----------------- ...bash \342\200\272 test flag (popup).run.xml" | 4 ++-- ...\200\272 test flag override (popup).run.xml" | 4 ++-- .../test_execute_compose_with_flag.bash.run.xml | 17 ----------------- .../build_and_run_IamBuildSystemTester.bash | 5 ++++- .../test_execute_compose_over_build_matrix.bash | 2 +- ...ute_compose_over_build_matrix_with_flag.bash | 2 +- .../test_execute_compose_with_flag.bash | 16 ---------------- 9 files changed, 10 insertions(+), 74 deletions(-) delete mode 100644 "build_system/.jetbrains_run_config/lpm_execute_compose.bash \342\200\272 lpm_execute_compose.bash -- build.run.xml" delete mode 100644 "build_system/.jetbrains_run_config/lpm_execute_compose.bash \342\200\272 lpm_execute_compose.bash \342\200\272 test flag (popup).run.xml" delete mode 100644 build_system/.jetbrains_run_config/test_execute_compose_with_flag.bash.run.xml delete mode 100644 build_system/tests/test_in_docker_container/test_execute_compose_with_flag.bash diff --git "a/build_system/.jetbrains_run_config/lpm_execute_compose.bash \342\200\272 lpm_execute_compose.bash -- build.run.xml" "b/build_system/.jetbrains_run_config/lpm_execute_compose.bash \342\200\272 lpm_execute_compose.bash -- build.run.xml" deleted file mode 100644 index 8f15f9da..00000000 --- "a/build_system/.jetbrains_run_config/lpm_execute_compose.bash \342\200\272 lpm_execute_compose.bash -- build.run.xml" +++ /dev/null @@ -1,17 +0,0 @@ - - - - \ No newline at end of file diff --git "a/build_system/.jetbrains_run_config/lpm_execute_compose.bash \342\200\272 lpm_execute_compose.bash \342\200\272 test flag (popup).run.xml" "b/build_system/.jetbrains_run_config/lpm_execute_compose.bash \342\200\272 lpm_execute_compose.bash \342\200\272 test flag (popup).run.xml" deleted file mode 100644 index e2b00e8c..00000000 --- "a/build_system/.jetbrains_run_config/lpm_execute_compose.bash \342\200\272 lpm_execute_compose.bash \342\200\272 test flag (popup).run.xml" +++ /dev/null @@ -1,17 +0,0 @@ - - - - \ No newline at end of file diff --git "a/build_system/.jetbrains_run_config/lpm_execute_compose_over_build_matrix.bash \342\200\272 test flag (popup).run.xml" "b/build_system/.jetbrains_run_config/lpm_execute_compose_over_build_matrix.bash \342\200\272 test flag (popup).run.xml" index 1cb0f0bc..137375a7 100644 --- "a/build_system/.jetbrains_run_config/lpm_execute_compose_over_build_matrix.bash \342\200\272 test flag (popup).run.xml" +++ "b/build_system/.jetbrains_run_config/lpm_execute_compose_over_build_matrix.bash \342\200\272 test flag (popup).run.xml" @@ -1,6 +1,6 @@ - -