Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: solve master and dev scheduled build instability #586

Merged
merged 2 commits into from
Sep 9, 2024
Merged

fix: solve master and dev scheduled build instability #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3ede28
fix: solve master and dev scheduled build instability
RedLeader962 Sep 9, 2024
df3e536
build: update norlab-build-system version
RedLeader962 Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build_system/.env.build_matrix.dependencies
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 build_system/utilities/norlab-build-system
Open in desktop
Submodule norlab-build-system updated 12 files
+1 −15 .github/pull_request_template.md
+1 −1 .github/workflows/semantic_release.yml
+2 −2 .run/[NBS] run_all_docker_build_tests.bash.run.xml
+2 −2 .run/[NBS] run_all_docker_dryrun_and_config_tests.bash.run.xml
+2 −2 .run/[NBS] run_bats_core_test_in_n2st.bash (all) .run.xml
+38 −0 CHANGELOG.md
+9 −4 build_system_templates/docker-compose.project_core.yaml
+11 −2 src/function_library/build_tools/execute_compose.bash
+7 −4 src/utility_scripts/nbs_execute_compose_over_build_matrix.bash
+6 −4 tests/run_bats_core_test_in_n2st.bash
+1 −1 utilities/norlab-shell-script-tools
+1 −1 version.txt
2 changes: 1 addition & 1 deletion build_system/utilities/norlab-shell-script-tools
Open in desktop
Submodule norlab-shell-script-tools updated 19 files
+1 −14 .github/pull_request_template.md
+67 −0 CHANGELOG.md
+16 −10 import_norlab_shell_script_tools_lib.bash
+13 −5 src/function_library/prompt_utilities.bash
+5 −2 src/function_library/teamcity_utilities.bash
+8 −6 src/function_library/terminal_splash.bash
+11 −4 src/utility_scripts/install_docker_tools.bash
+3 −2 src/utility_scripts/which_architecture_and_os.bash
+3 −4 src/utility_scripts/which_python_version.bash
+9 −0 tests/bats_testing_tools/Dockerfile.bats-core-code-isolation.alpine
+5 −3 tests/bats_testing_tools/Dockerfile.bats-core-code-isolation.ubuntu
+49 −12 tests/bats_testing_tools/run_bats_tests_in_docker.bash
+1 −0 tests/test_dotenv_files.bats
+45 −0 tests/test_import_lib.bats
+3 −1 tests/test_prompt_utilities.bats
+12 −0 tests/test_teamcity_utilities.bats
+5 −0 tests/test_terminal_splash.bats
+2 −3 tests/tests_template/run_bats_core_test_in_n2st.bash
+1 −1 version.txt
2 changes: 1 addition & 1 deletion doc/LinkingProjects.md
View file
Open in desktop
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
Loading