Skip to content

Commit

Permalink
Merge pull request #586 from norlab-ulaval/release
Browse files Browse the repository at this point in the history
fix: solve master and dev scheduled build instability
  • Loading branch information
RedLeader962 authored Sep 9, 2024
2 parents 34ae751 + df3e536 commit 6aa08f3
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 18 deletions.
2 changes: 1 addition & 1 deletion build_system/.env.build_matrix.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ NBS_EXECUTE_BUILD_MATRIX_OVER_COMPOSE_FILE=docker-compose.dependencies.yaml
# Libpointmatcher version
#
# 'latest' is the latest push to the libpointmatcher master branch
NBS_MATRIX_REPOSITORY_VERSIONS=( '1.4.2' 'latest' )
NBS_MATRIX_REPOSITORY_VERSIONS=( '1.4.3' 'latest' )

#
# Libpointmatcher dependencies CMAKE_BUILD_TYPE
Expand Down
2 changes: 1 addition & 1 deletion build_system/.env.build_matrix.libpointmatcher
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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.2' 'latest' )
#NBS_MATRIX_REPOSITORY_VERSIONS=( '1.4.3' 'latest' )
NBS_MATRIX_REPOSITORY_VERSIONS=( 'latest' )

#
Expand Down
2 changes: 1 addition & 1 deletion build_system/.env.build_matrix.libpointmatcher.bleeding
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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.2' 'latest' )
#NBS_MATRIX_REPOSITORY_VERSIONS=( '1.4.3' 'latest' )
NBS_MATRIX_REPOSITORY_VERSIONS=( 'latest' )

#
Expand Down
2 changes: 1 addition & 1 deletion build_system/.env.build_matrix.libpointmatcher.release
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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.2' 'latest' )
NBS_MATRIX_REPOSITORY_VERSIONS=( '1.4.3' 'latest' )

#
# Libpointmatcher CMAKE_BUILD_TYPE
Expand Down
11 changes: 7 additions & 4 deletions build_system/docker-compose.dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ services:
# ====Dependency related services================================================================
dependencies-general:
image: ${NBS_DOCKERHUB_NAMESPACE:?err}/libpointmatcher-dependencies-general:${NBS_IMAGE_TAG:?err}
pull_policy: build # Execute the `build` attribute over pulling the `image` attribute
build:
target: libpointmatcher-dependencies-general
context: ..
dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR:?err}/ubuntu/Dockerfile.dependencies
no_cache: true # Enforce full rebuild
platforms:
- "linux/amd64"
- "linux/arm64/v8"
- "linux/arm64"
args:
BASE_IMAGE: ${DEPENDENCIES_BASE_IMAGE:?err}
BASE_IMAGE_TAG: ${DEPENDENCIES_BASE_IMAGE_TAG:?err}
Expand All @@ -34,14 +36,15 @@ services:
build:
context: ..
dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR:?err}/ubuntu/Dockerfile.dependencies.doxygen
platforms:
- "linux/amd64"
- "linux/arm64/v8"
pull: false # Use the local image store to execute the FROM directive
args:
PROJECT_HUB: ${NBS_DOCKERHUB_NAMESPACE}
BASE_IMAGE: libpointmatcher-dependencies
BASE_IMAGE_TAG: ${NBS_IMAGE_TAG}
IS_TEAMCITY_RUN: ${IS_TEAMCITY_RUN}
platforms:
- "linux/amd64"
- "linux/arm64"
depends_on:
- dependencies
tty: true
Expand Down
15 changes: 8 additions & 7 deletions build_system/docker-compose.libpointmatcher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ services:
# ....Test logic related to libpointmatcher install casses.......................................
_test_compilation:
image: ${NBS_DOCKERHUB_NAMESPACE:?err}/libpointmatcher-compilation-test:${NBS_IMAGE_TAG:?err}
pull_policy: build
pull_policy: build # Execute the `build` attribute over pulling the `image` attribute
build:
context: ..
dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR:?err}/ubuntu/Dockerfile.libpointmatcher.compilation_test
no_cache: false
no_cache: true # Enforce full rebuild
target: test-compilation-auto-path-resolution
platforms:
- "linux/amd64"
- "linux/arm64/v8"
- "linux/arm64"
args:
PROJECT_HUB: ${NBS_DOCKERHUB_NAMESPACE}
BASE_IMAGE: libpointmatcher-dependencies-general
Expand Down Expand Up @@ -45,11 +45,11 @@ services:
# ....Test logic related to libpointmatcher codebase unit-test...................................
ci_PR:
image: ${NBS_DOCKERHUB_NAMESPACE:?err}/libpointmatcher-ci-pr:${NBS_IMAGE_TAG:?err}
pull_policy: build
pull_policy: build # Execute the `build` attribute over pulling the `image` attribute
build:
context: ..
dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/ubuntu/Dockerfile.libpointmatcher.ci_PR
no_cache: false
no_cache: true # Enforce full rebuild
args:
PROJECT_HUB: ${NBS_DOCKERHUB_NAMESPACE}
BASE_IMAGE: libpointmatcher-dependencies
Expand Down Expand Up @@ -90,13 +90,14 @@ services:
release:
image: ${NBS_DOCKERHUB_NAMESPACE:?err}/libpointmatcher:${NBS_IMAGE_TAG:?err}
container_name: libpointmatcher
pull_policy: build # Execute the `build` attribute over pulling the `image` attribute
build:
context: ..
dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/ubuntu/Dockerfile.libpointmatcher.hub_release
platforms:
- "linux/amd64"
- "linux/arm64/v8"
no_cache: false
- "linux/arm64"
no_cache: true # Enforce full rebuild
args:
PROJECT_HUB: ${NBS_DOCKERHUB_NAMESPACE}
BASE_IMAGE: libpointmatcher-dependencies-doc
Expand Down
2 changes: 1 addition & 1 deletion doc/LinkingProjects.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ In this following example, we build a very simple CMake project containing one e
cmake_minimum_required (VERSION 3.10.12)
project (myProject)
find_package(libpointmatcher 1.4.2 REQUIRED)
find_package(libpointmatcher 1.4.3 REQUIRED)
include_directories("${libpointmatcher_INCLUDE_DIRS}")
message(STATUS "Using libpointmatcher version ${libpointmatcher_VERSION}")
Expand Down

0 comments on commit 6aa08f3

Please sign in to comment.