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 feabcf46 Resolve upstream openssl conan-requirement conflict.
feabcf46 is described below

commit feabcf46b0468f8536cba5cc0e78a5ca177e4695
Author: PengZheng <[email protected]>
AuthorDate: Wed Jan 18 17:25:31 2023 +0800

    Resolve upstream openssl conan-requirement conflict.
---
 .github/workflows/coverage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index bda133df..f3cb4ebd 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -27,7 +27,7 @@ jobs:
             -o enable_code_coverage=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

Reply via email to