Skip to content

Commit

Permalink
fix: update build matrix and configuration files
Browse files Browse the repository at this point in the history
- Rearrange Ubuntu distro build order
- Update 'latest' description to current checkout branch
- Rename Jetbrains run configuration file for libpointmatcher build matrix

Issue NMO-589
  • Loading branch information
RedLeader962 committed Sep 14, 2024
1 parent 3ca234d commit 08779c9
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions build_system/.env.build_matrix.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ NBS_EXECUTE_BUILD_MATRIX_OVER_COMPOSE_FILE=docker-compose.dependencies.yaml
#
# Libpointmatcher version
#
# 'latest' is the latest push to the libpointmatcher master branch
# 'latest' is the most recent push to the current libpointmatcher checkout branch
NBS_MATRIX_REPOSITORY_VERSIONS=( '1.4.3' 'latest' )

#
Expand All @@ -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
# Part of the build matrix used for PR
NBS_MATRIX_UBUNTU_SUPPORTED_VERSIONS=( 'bionic' 'focal' 'jammy' )
NBS_MATRIX_UBUNTU_SUPPORTED_VERSIONS=( 'jammy' 'focal' 'bionic' )
#
# 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' )
Expand Down
5 changes: 2 additions & 3 deletions build_system/.env.build_matrix.libpointmatcher
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ NBS_EXECUTE_BUILD_MATRIX_OVER_COMPOSE_FILE=docker-compose.libpointmatcher.yaml
#
# Libpointmatcher version
#
# 'latest' is the latest push to the libpointmatcher master branch
#NBS_MATRIX_REPOSITORY_VERSIONS=( '1.4.3' 'latest' )
# 'latest' is the most recent push to the current libpointmatcher checkout branch
NBS_MATRIX_REPOSITORY_VERSIONS=( 'latest' )

#
Expand All @@ -32,7 +31,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' 'jammy' )
NBS_MATRIX_UBUNTU_SUPPORTED_VERSIONS=( 'jammy' 'focal' 'bionic' )
#
# 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' )
Expand Down
5 changes: 2 additions & 3 deletions build_system/.env.build_matrix.libpointmatcher.bleeding
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ NBS_EXECUTE_BUILD_MATRIX_OVER_COMPOSE_FILE=docker-compose.libpointmatcher.yaml
#
# Libpointmatcher version
#
# 'latest' is the latest push to the libpointmatcher master branch
#NBS_MATRIX_REPOSITORY_VERSIONS=( '1.4.3' 'latest' )
# 'latest' is the most recent push to the current libpointmatcher checkout branch
NBS_MATRIX_REPOSITORY_VERSIONS=( 'latest' )

#
Expand All @@ -33,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' 'jammy' )
NBS_MATRIX_UBUNTU_SUPPORTED_VERSIONS=( 'jammy' 'focal' 'bionic' )
#
# 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' )
Expand Down
4 changes: 2 additions & 2 deletions build_system/.env.build_matrix.libpointmatcher.release
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ NBS_EXECUTE_BUILD_MATRIX_OVER_COMPOSE_FILE=docker-compose.libpointmatcher.yaml
#
# Libpointmatcher version
#
# 'latest' is the latest push to the libpointmatcher master branch
# 'latest' is the most recent push to the current libpointmatcher checkout branch
NBS_MATRIX_REPOSITORY_VERSIONS=( '1.4.3' 'latest' )

#
Expand All @@ -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' 'jammy' )
NBS_MATRIX_UBUNTU_SUPPORTED_VERSIONS=( 'jammy' 'focal' 'bionic' )
#
# 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' )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="bash lpm_crawl_libpointmatcher_build_matrix.bash › build ci_PR_arm64v8 &lt;popup&gt;" type="ShConfigurationType" folderName="[LPM] C | Execute compose over build matrix" editBeforeRun="true">
<option name="SCRIPT_TEXT" value="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 Release --ubuntu-version-build-matrix-override jammy --fail-fast -- build ci_PR_arm64v8" />
<configuration default="false" name="bash lpm_crawl_libpointmatcher_build_matrix.bash › build ci_PR_arm64 &lt;popup&gt;" type="ShConfigurationType" folderName="[LPM] C | Execute compose over build matrix" editBeforeRun="true">
<option name="SCRIPT_TEXT" value="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 Release --ubuntu-version-build-matrix-override jammy --fail-fast -- build ci_PR_arm64" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="" />
<option name="SCRIPT_OPTIONS" value="" />
Expand Down
2 changes: 1 addition & 1 deletion build_system/docker-compose.libpointmatcher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include:
services:

# ====Pull-request related services==============================================================
# ....Test logic related to libpointmatcher install casses.......................................
# ....Test logic related to libpointmatcher install cases........................................
_test_compilation:
image: ${NBS_DOCKERHUB_NAMESPACE:?err}/libpointmatcher-compilation-test:${NBS_IMAGE_TAG:?err}
pull_policy: build # Execute the `build` attribute over pulling the `image` attribute
Expand Down
2 changes: 1 addition & 1 deletion build_system/utilities/norlab-build-system

0 comments on commit 08779c9

Please sign in to comment.