This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch feature/update_github_actions
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/feature/update_github_actions
by this push:
new 4a3e9640 Fix some conan-related issues.
4a3e9640 is described below
commit 4a3e96406b7f7d47857e1dd033aa805289caac5b
Author: PengZheng <[email protected]>
AuthorDate: Wed Jan 18 17:06:59 2023 +0800
Fix some conan-related issues.
---
.github/workflows/macos.yml | 3 ++-
.github/workflows/ubuntu.yml | 4 ++--
conanfile.py | 15 ---------------
3 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 72e73eca..ab6a4c68 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -17,6 +17,7 @@ jobs:
uses: actions/[email protected]
- name: Install conan
run: |
+ brew update
brew install conan
- name: Setup Conan Profile
run: |
@@ -30,7 +31,7 @@ jobs:
-o celix:build_all=True
run: |
#force reequire 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 --require-override=libcurl/7.64.1
+ conan install . celix/ci -pr:b default -pr:h default -if build
${CONAN_BUILD_OPTIONS} -b missing --require-override=libcurl/7.64.1
--require-override=openssl/1.1.1s
- name: Build
run: |
conan build . -bf build --configure
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 9fd7764f..12b97383 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -21,7 +21,7 @@ jobs:
uses: actions/[email protected]
- name: Install conan
run: |
- sudo pip install conan
+ sudo pip install -U conan
- name: Setup Conan Profile
env:
CC: ${{ matrix.compiler[0] }}
@@ -42,7 +42,7 @@ jobs:
-o celix:build_all=True
run: |
#force reequire 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 --require-override=libcurl/7.64.1
+ conan install . celix/ci -pr:b default -pr:h default -if build
${CONAN_BUILD_OPTIONS} -b missing --require-override=libcurl/7.64.1
--require-override=openssl/1.1.1s
- name: Build
env:
CC: ${{ matrix.compiler[0] }}
diff --git a/conanfile.py b/conanfile.py
index f1c05008..4b9b81bf 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -47,8 +47,6 @@ class CelixConan(ConanFile):
"enable_testing_for_cxx14": [True, False],
"build_all": [True, False],
"build_deployment_admin": [True, False],
- "build_device_access_example": [True, False],
- "build_device_access": [True, False],
"build_http_admin": [True, False],
"build_log_service": [True, False],
"build_syslog_writer": [True, False],
@@ -94,8 +92,6 @@ class CelixConan(ConanFile):
"enable_testing_for_cxx14": False,
"build_all": False,
"build_deployment_admin": False,
- "build_device_access": False,
- "build_device_access_example": False,
"build_http_admin": True,
"build_log_service": True,
"build_syslog_writer": True,
@@ -140,7 +136,6 @@ class CelixConan(ConanFile):
def package_id(self):
del self.info.options.build_all
# the followings are not installed
- del self.info.options.build_device_access_example
del self.info.options.build_pubsub_integration
del self.info.options.build_pubsub_examples
del self.info.options.build_cxx_rsa_integration
@@ -170,8 +165,6 @@ class CelixConan(ConanFile):
if not self.options.enable_testing:
self.options.build_pubsub_integration = False
self.options.enable_code_coverage = False
- if not self.options.build_device_access:
- self.options.build_device_access_example = False
if not self.options.build_log_service:
self.options.build_syslog_writer = False
if not self.options.build_pubsub:
@@ -231,14 +224,6 @@ class CelixConan(ConanFile):
self.requires("czmq/4.2.0")
self.options['czmq'].shared = True
- #If czmq is needed, disable crypto for libzip to prevent openssl
conflict:
- # 'czmq/4.2.0' requires 'openssl/1.1.1m' while 'libcurl/7.86.0'
requires 'openssl/1.1.1s'
- self.options['libzip'].crypto = False
-
- #If czmq is needed, disable ssl for libcurl to prevent openssl
conflict:
- # 'czmq/4.2.0' requires 'openssl/1.1.1m' while 'libcurl/7.87.0'
requires 'openssl/1.1.1s'
- self.options['libcurl'].with_ssl = False
-
def _configure_cmake(self):
if self._cmake:
return self._cmake
