From 5c878b7ffa41fc7544a08f79725127d2aa07c401 Mon Sep 17 00:00:00 2001 From: RedLeaderOne Date: Mon, 22 Jan 2024 13:44:52 -0500 Subject: [PATCH 1/2] build: add ubuntu jammy to build matrix [NMO-508] - update build matrix - update supported version in main doc, ubuntu install doc and contributing instructions - update submodule to latest - update jetbrains local run configuration --- .gitmodules | 2 ++ README.md | 5 ++-- build_system/.env.build_matrix.dependencies | 1 - .../.env.build_matrix.libpointmatcher | 2 +- ....env.build_matrix.libpointmatcher.bleeding | 1 - .../.env.build_matrix.libpointmatcher.release | 2 +- ...ies_arm64v8 ci_PR_arm64v8 _popup_.run.xml" | 4 +-- ...ependencies (BUILD MATRIX SUBSET).run.xml" | 4 +-- ...efixed_path (BUILD MATRIX SUBSET).run.xml" | 4 +-- ...rminal in a Ubuntu 20.04 container.run.xml | 4 +-- .../Dockerfile.build_system_test | 2 +- build_system/utilities/norlab-build-system | 2 +- .../utilities/norlab-shell-script-tools | 2 +- doc/CompilationUbuntu.md | 26 +++++++++---------- doc/contributing/contributing_instructions.md | 4 +-- 15 files changed, 32 insertions(+), 33 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7af81530..fd80d0da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,8 @@ [submodule "build_system/utilities/norlab-build-system"] path = build_system/utilities/norlab-build-system url = https://github.com/norlab-ulaval/norlab-build-system.git + branch = main [submodule "build_system/utilities/norlab-shell-script-tools"] path = build_system/utilities/norlab-shell-script-tools url = https://github.com/norlab-ulaval/norlab-shell-script-tools.git + branch = main diff --git a/README.md b/README.md index 57054abb..756fa9e2 100644 --- a/README.md +++ b/README.md @@ -48,11 +48,10 @@ The library is written in C++ for efficiency with [bindings in Python](doc/index ### Supported OS And Architecture _libpointmatcher_ is tested on our build system under the following architecture and OS: -- Ubuntu bionic (18.04) and focal (20.04) +- Ubuntu bionic (18.04), focal (20.04) and jammy (22.04) - x86 and arm64/v8 -Note: -- support for Ubuntu jammy (22.04) comming soon +Note: - _libpointmatcher_ reportedly works on MacOs OsX (latest) and Windows (latest) diff --git a/build_system/.env.build_matrix.dependencies b/build_system/.env.build_matrix.dependencies index 957d0cfd..7e02ac3a 100644 --- a/build_system/.env.build_matrix.dependencies +++ b/build_system/.env.build_matrix.dependencies @@ -32,7 +32,6 @@ NBS_MATRIX_SUPPORTED_OS=( 'ubuntu' ) # Ubuntu release: https://ubuntu.com/about/release-cycle # bionic=18.04 focal=20.04 jammy=22.04 # Part of the build matrix used for PR -#NBS_MATRIX_UBUNTU_SUPPORTED_VERSIONS=( 'bionic' 'focal' ) NBS_MATRIX_UBUNTU_SUPPORTED_VERSIONS=( 'bionic' 'focal' 'jammy' ) # # iceboxed: implement other OS support (ref task NMO-213 OsX arm64-Darwin and NMO-210 OsX x86 CD components) diff --git a/build_system/.env.build_matrix.libpointmatcher b/build_system/.env.build_matrix.libpointmatcher index 3fb3597c..11bf54f5 100644 --- a/build_system/.env.build_matrix.libpointmatcher +++ b/build_system/.env.build_matrix.libpointmatcher @@ -32,7 +32,7 @@ NBS_MATRIX_SUPPORTED_OS=( 'ubuntu' ) # # Ubuntu release: https://ubuntu.com/about/release-cycle # bionic=18.04 focal=20.04 jammy=22.04 -NBS_MATRIX_UBUNTU_SUPPORTED_VERSIONS=( 'bionic' 'focal' ) +NBS_MATRIX_UBUNTU_SUPPORTED_VERSIONS=( 'bionic' 'focal' 'jammy' ) # # iceboxed: implement other OS support (ref task NMO-213 OsX arm64-Darwin and NMO-210 OsX x86 CD components) #NBS_MATRIX_OSX_SUPPORTED_VERSIONS=( 'monterey' 'ventura' ) diff --git a/build_system/.env.build_matrix.libpointmatcher.bleeding b/build_system/.env.build_matrix.libpointmatcher.bleeding index 461c7793..5410134f 100644 --- a/build_system/.env.build_matrix.libpointmatcher.bleeding +++ b/build_system/.env.build_matrix.libpointmatcher.bleeding @@ -34,7 +34,6 @@ NBS_MATRIX_SUPPORTED_OS=( 'ubuntu' ) # Ubuntu release: https://ubuntu.com/about/release-cycle # bionic=18.04 focal=20.04 jammy=22.04 NBS_MATRIX_UBUNTU_SUPPORTED_VERSIONS=( 'bionic' 'focal' 'jammy' ) -# ToDo: fixme!! (ref task NMO-305 ﹅→ Build fail: ubuntu jammy with utest compilation). # # iceboxed: implement other OS support (ref task NMO-213 OsX arm64-Darwin and NMO-210 OsX x86 CD components) #NBS_MATRIX_OSX_SUPPORTED_VERSIONS=( 'monterey' 'ventura' ) diff --git a/build_system/.env.build_matrix.libpointmatcher.release b/build_system/.env.build_matrix.libpointmatcher.release index 1064c50d..0be446c6 100644 --- a/build_system/.env.build_matrix.libpointmatcher.release +++ b/build_system/.env.build_matrix.libpointmatcher.release @@ -30,7 +30,7 @@ NBS_MATRIX_SUPPORTED_OS=( 'ubuntu' ) # # Ubuntu release: https://ubuntu.com/about/release-cycle # bionic=18.04 focal=20.04 jammy=22.04 -NBS_MATRIX_UBUNTU_SUPPORTED_VERSIONS=( 'bionic' 'focal' ) +NBS_MATRIX_UBUNTU_SUPPORTED_VERSIONS=( 'bionic' 'focal' 'jammy' ) # # iceboxed: implement other OS support (ref task NMO-213 OsX arm64-Darwin and NMO-210 OsX x86 CD components) #NBS_MATRIX_OSX_SUPPORTED_VERSIONS=( 'monterey' 'ventura' ) diff --git "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build dependencies_arm64v8 ci_PR_arm64v8 _popup_.run.xml" "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build dependencies_arm64v8 ci_PR_arm64v8 _popup_.run.xml" index 1e381aae..6b7fc9c7 100644 --- "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build dependencies_arm64v8 ci_PR_arm64v8 _popup_.run.xml" +++ "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build dependencies_arm64v8 ci_PR_arm64v8 _popup_.run.xml" @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build dependencies-general dependencies (BUILD MATRIX SUBSET).run.xml" "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build dependencies-general dependencies (BUILD MATRIX SUBSET).run.xml" index 3caec4cd..9cc3dd81 100644 --- "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build dependencies-general dependencies (BUILD MATRIX SUBSET).run.xml" +++ "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build dependencies-general dependencies (BUILD MATRIX SUBSET).run.xml" @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation_prefixed_path (BUILD MATRIX SUBSET).run.xml" "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation_prefixed_path (BUILD MATRIX SUBSET).run.xml" index cc0fb90f..c23d7b5f 100644 --- "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation_prefixed_path (BUILD MATRIX SUBSET).run.xml" +++ "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation_prefixed_path (BUILD MATRIX SUBSET).run.xml" @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/build_system/.jetbrains_run_config/run and open a terminal in a Ubuntu 20.04 container.run.xml b/build_system/.jetbrains_run_config/run and open a terminal in a Ubuntu 20.04 container.run.xml index 6f3419b4..64f5096e 100644 --- a/build_system/.jetbrains_run_config/run and open a terminal in a Ubuntu 20.04 container.run.xml +++ b/build_system/.jetbrains_run_config/run and open a terminal in a Ubuntu 20.04 container.run.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/build_system/tests/tests_docker_interactive/Dockerfile.build_system_test b/build_system/tests/tests_docker_interactive/Dockerfile.build_system_test index 0a9c0e35..0d6318dc 100644 --- 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,5 @@ ARG BASE_IMAGE=ubuntu -ARG BASE_IMAGE_TAG=focal +ARG BASE_IMAGE_TAG=jammy FROM ${BASE_IMAGE}:${BASE_IMAGE_TAG} AS base-image LABEL org.opencontainers.image.authors="luc.coupal.1@ulaval.ca" diff --git a/build_system/utilities/norlab-build-system b/build_system/utilities/norlab-build-system index ef62eb26..54bab512 160000 --- a/build_system/utilities/norlab-build-system +++ b/build_system/utilities/norlab-build-system @@ -1 +1 @@ -Subproject commit ef62eb26ee11d1919d7a91b9c2698ffa488b60bd +Subproject commit 54bab5126598a5f92104eb6b30b278d8e89629f4 diff --git a/build_system/utilities/norlab-shell-script-tools b/build_system/utilities/norlab-shell-script-tools index c28acaa9..16c0fdbd 160000 --- a/build_system/utilities/norlab-shell-script-tools +++ b/build_system/utilities/norlab-shell-script-tools @@ -1 +1 @@ -Subproject commit c28acaa953a597ea0fbdaa98c2600624f448f6ce +Subproject commit 16c0fdbd1fdd01dfa7fc15c2d88388f11b300350 diff --git a/doc/CompilationUbuntu.md b/doc/CompilationUbuntu.md index 7964cc8b..51d9ee31 100644 --- a/doc/CompilationUbuntu.md +++ b/doc/CompilationUbuntu.md @@ -7,19 +7,19 @@ If you are used to development projects, here is what you need: -| Name | Version
(Tested on our CI/CD server) | Version
(Tested on our CI/CD server) | -|:---------------|:--------------------------------------------------:|:--------------------------------------------------:| -| Ubuntu | bionic 18.04.1 LTS (64 bit) | focal 20.04 LTS (64 bit) | -| Architecture | x86 and arm64/v8 | x86 and arm64/v8 | -| gcc | 7.5.0 | latest | -| git | 2.17.1 | latest | -| cmake | 3.10.2 | latest | -| doxygen (opt.) | 1.8.13-10 | latest | -| | | | -| _Dependency:_ | | | -| boost | 1.65.1 | latest | -| eigen | 3.3.4-4 | latest | -| yaml-cpp | 0.5+ | latest | +| Name | Version
(Tested on our CI/CD server) | Version
(Tested on our CI/CD server) | Version
(Tested on our CI/CD server) | +|:---------------|:--------------------------------------------------:|:-------------------------------------------------------:|:------------------------------------------:| +| Ubuntu | bionic 18.04.1 LTS (64 bit) | focal 20.04 LTS (64 bit) | jammy 22.04 LTS (64 bit) | +| Architecture | x86 and arm64/v8 | x86 and arm64/v8 | x86 and arm64/v8 | +| gcc | 7.5.0 | latest | latest | +| git | 2.17.1 | latest | latest | +| cmake | 3.10.2 | latest | latest | +| doxygen (opt.) | 1.8.13-10 | latest | latest | +| | | | | +| _Dependency:_ | | | | +| boost | 1.65.1 | latest | latest | +| eigen | 3.3.4-4 | latest | latest | +| yaml-cpp | 0.5+ | latest | latest | | libnabo | [from source](https://github.com/norlab-ulaval/libnabo) | [from source](https://github.com/norlab-ulaval/libnabo) | __Note:__ we only support 64-bit systems because of some issues with Eigen. Other versions will most probably work but you'll have to try yourself to know for sure. diff --git a/doc/contributing/contributing_instructions.md b/doc/contributing/contributing_instructions.md index de0c1c59..cf788e98 100644 --- a/doc/contributing/contributing_instructions.md +++ b/doc/contributing/contributing_instructions.md @@ -33,7 +33,7 @@ configuration on our build system and the pull request will be granted if the bu succeed. **Current build matrix:** -`[latest] x [x86, arm64] x [ubuntu] x [bionic, focal] x [Release, RelWithDebInfo, MinSizeRel]` +`[latest] x [x86, arm64] x [ubuntu] x [bionic, focal, jammy] x [Release, RelWithDebInfo, MinSizeRel]` ### Development Workflow @@ -73,7 +73,7 @@ bash lpm_crawl_libpointmatcher_build_matrix.bash \ --repository-version-build-matrix-override latest \ --os-name-build-matrix-override ubuntu \ --cmake-build-type-build-matrix-override RelWithDebInfo \ - --ubuntu-version-build-matrix-override focal \ + --ubuntu-version-build-matrix-override jammy \ --fail-fast \ -- build ci_PR_amd64 ci_PR_arm64v8 From 4c1a7085a59e0a831e8f97716a005db41e2e4768 Mon Sep 17 00:00:00 2001 From: RedLeaderOne Date: Mon, 22 Jan 2024 17:29:02 -0500 Subject: [PATCH 2/2] fix(integration-test): add missing CMAKE_INSTALL_PREFIX flag to norlab-icp-mapper [NMO-508] Problem: It was crashing the build under ubuntu jammy --- ...h \342\200\272 build test_compilation__ (Release).run.xml" | 2 +- .../ubuntu/Dockerfile.libpointmatcher.compilation_test | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation__ (Release).run.xml" "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation__ (Release).run.xml" index 68949630..c7fab276 100644 --- "a/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation__ (Release).run.xml" +++ "b/build_system/.jetbrains_run_config/bash lpm_execute_compose_over_build_matrix.bash \342\200\272 build test_compilation__ (Release).run.xml" @@ -1,6 +1,6 @@ -