[celix] branch feature/civetweb_integration updated: Work-around cpputest conan package error.

[pengzheng]

This is an automated email from the ASF dual-hosted git repository.

pengzheng pushed a commit to branch feature/civetweb_integration
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/feature/civetweb_integration 
by this push:
     new 5c8dea25 Work-around cpputest conan package error.
5c8dea25 is described below

commit 5c8dea2503559eac478e244a014c4a68ce8f5910
Author: PengZheng <howto...@gmail.com>
AuthorDate: Thu Feb 2 18:40:50 2023 +0800

    Work-around cpputest conan package error.
---
 .github/workflows/coverage.yml | 2 +-
 .github/workflows/ubuntu.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 663805ee..a4912171 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 
--require-override=openssl/1.1.1s
+          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
       - name: Build
         run: |
           conan build . -bf build --configure
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 1d1a65ef..0539dcf6 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -49,7 +49,7 @@ jobs:
             -o celix:build_all=True
         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  --require-override=libcurl/7.64.1 
--require-override=openssl/1.1.1s
+          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
       - name: Build
         env:
           CC: ${{ matrix.compiler[0] }}