This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 4c24ebfc5c4f4072dae77fa8625e3e94c4307dc3
Merge: 6cde7b48 bfe9ed8a
Author: Pepijn Noltes <pepijnnol...@gmail.com>
AuthorDate: Thu Aug 10 15:46:54 2023 +0200
Merge pull request #605 from
apache/feature/allow_duplicate_bundles_in_container
Feature/allow duplicate bundles in container
.github/workflows/macos.yml | 1 +
.github/workflows/ubuntu.yml | 5 ++-
CMakeLists.txt | 5 ++-
cmake/celix_project/WarningTests.cmake | 55 +++++++++++++++++++++++++
cmake/cmake_celix/ContainerPackaging.cmake | 66 +++++++++++++++++++++++-------
conanfile.py | 3 ++
6 files changed, 118 insertions(+), 17 deletions(-)
diff --cc .github/workflows/macos.yml
index 23f001cf,d211b044..b2feb276
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@@ -30,8 -30,8 +30,9 @@@ jobs
-o celix:build_all=True
-o celix:enable_testing_for_cxx14=True
-o celix:enable_testing_dependency_manager_for_cxx11=True
+ -o celix:enable_cmake_warning_tests=True
-o celix:enable_testing_on_ci=True
+ -o celix:framework_curlinit=False
run: |
#force require libcurl 7.64.1, due to a sha256 verify issue in
libcurl/7.87.0
conan install . celix/ci -pr:b default -pr:h default -if build
${CONAN_BUILD_OPTIONS} -b missing -b cpputest --require-override=libcurl/7.64.1
--require-override=openssl/1.1.1s
diff --cc .github/workflows/ubuntu.yml
index aec3581d,fef433b5..3f2dc9da
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@@ -50,8 -50,8 +50,9 @@@ jobs
-o celix:build_all=True
-o celix:enable_testing_for_cxx14=True
-o celix:enable_testing_dependency_manager_for_cxx11=True
+ -o celix:enable_cmake_warning_tests=True
-o celix:enable_testing_on_ci=True
+ -o celix:framework_curlinit=False
run: |
#force require libcurl 7.64.1, due to a sha256 verify issue in
libcurl/7.87.0
conan install . celix/ci -pr:b release -pr:h default -if build
${CONAN_BUILD_OPTIONS} -b missing -b cpputest
--require-override=libcurl/7.64.1 --require-override=openssl/1.1.1s
diff --cc conanfile.py
index 73f679c2,0e25b31e..622a34a0
--- a/conanfile.py
+++ b/conanfile.py
@@@ -98,8 -98,8 +98,9 @@@ class CelixConan(ConanFile)
"celix_install_deprecated_api": [True, False],
"celix_use_compression_for_bundle_zips": [True, False],
"celix_err_buffer_size": "ANY",
+ "enable_cmake_warning_tests": [True, False],
"enable_testing_on_ci": [True, False],
+ "framework_curlinit": [True, False],
}
default_options = {
"enable_testing": False,
@@@ -162,8 -162,8 +163,9 @@@
"celix_install_deprecated_api": False,
"celix_use_compression_for_bundle_zips": True,
"celix_err_buffer_size": 512,
+ "enable_cmake_warning_tests": False,
"enable_testing_on_ci": False,
+ "framework_curlinit": True,
}
_cmake = None
