This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 5e18244cf4260e2c9f278b3c247e00d614f3c5b1
Merge: 06ae35ae7 3b5459728
Author: PengZheng <howto...@gmail.com>
AuthorDate: Sat Jan 11 21:19:21 2025 +0800
Merge pull request #731 from apache/feature/devcontainer
Feature/devcontainer
.devcontainer/Containerfile | 127 ++++++++++++++++++++
.devcontainer/README.md | 69 +++++++++++
.../build-devcontainer-image.sh | 5 +-
.../build-project-with-conan.sh | 15 +--
.../conan-container-debug-profile | 25 ++--
.../conan-container-default-profile | 25 ++--
.devcontainer/devcontainer.json | 15 +++
.devcontainer/run-devcontainer.sh | 133 +++++++++++++++++++++
.../setup-project-with-apt.sh | 17 ++-
.../setup-project-with-conan.sh | 15 +--
.github/workflows/celix_etcdlib.yml | 2 +-
.github/workflows/celix_promise.yml | 2 +-
.github/workflows/conan_create.yml | 14 +--
.github/workflows/containers.yml | 98 ++++++++++++---
.github/workflows/coverage.yml | 6 +-
.github/workflows/coverity-scan.yml | 2 +-
.github/workflows/macos.yml | 10 +-
.github/workflows/ubuntu.yml | 12 +-
README.md | 2 +-
.../discovery_zeroconf/gtest/CMakeLists.txt | 2 +-
.../src/DiscoveryZeroconfAnnouncerTestSuite.cc | 4 +-
.../gtest/src/DiscoveryZeroconfWatcherTestSuite.cc | 10 +-
conanfile.py | 1 +
container/Containerfile.gitpod | 61 ----------
container/Containerfile.ubuntu | 71 -----------
container/README.md | 55 ---------
container/run-ubuntu-container.sh | 47 --------
documents/development/README.md | 3 +-
examples/conan_test_package/CMakeLists.txt | 13 ++
examples/conan_test_package/conanfile.py | 1 +
examples/conan_test_package_v2/conanfile.py | 1 +
31 files changed, 521 insertions(+), 342 deletions(-)
diff --cc conanfile.py
index de23229d9,92fb9bb7f..cfce0de63
--- a/conanfile.py
+++ b/conanfile.py
@@@ -351,9 -339,8 +351,10 @@@ class CelixConan(ConanFile)
# https://github.com/conan-io/conan-center-index/pull/16254
self.requires("mdnsresponder/1310.140.1")
# 'libzip/1.10.1' requires 'zlib/1.2.13' while 'libcurl/7.64.1'
requires 'zlib/1.2.12'
+ self.requires("openssl/[>=3.2.0]", override=True)
self.requires("zlib/1.2.13", override=True)
+ if self.options.build_event_admin_remote_provider_mqtt:
+ self.requires("mosquitto/[>=2.0.3 <3.0.0]")
self.validate()
def generate(self):
