[celix] branch feature/579-automatic-dependency-deduction updated: Fix zlib conflict for conan create CI test.

[pengzheng]

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

pengzheng pushed a commit to branch feature/579-automatic-dependency-deduction
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to 
refs/heads/feature/579-automatic-dependency-deduction by this push:
     new 2870ad5e Fix zlib conflict for conan create CI test.
2870ad5e is described below

commit 2870ad5e037367f5920505d4489ab7973eddb9f8
Author: PengZheng <howto...@gmail.com>
AuthorDate: Sat Jul 15 13:15:44 2023 +0800

    Fix zlib conflict for conan create CI test.
---
 .github/workflows/conan_create.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/conan_create.yml 
b/.github/workflows/conan_create.yml
index 89b7c314..0d05b862 100644
--- a/.github/workflows/conan_create.yml
+++ b/.github/workflows/conan_create.yml
@@ -39,16 +39,9 @@ jobs:
           #Note no backwards compatiblity for gcc5 needed, setting libcxx to 
c++11.
           conan profile update settings.compiler.libcxx=libstdc++11 default
           conan profile show default
-      - name: Configure and install dependencies
-        env:
-          CC: ${{ matrix.compiler[0] }}
-          CXX: ${{ matrix.compiler[1] }}
-        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 -o 
celix:build_all=True -b missing --require-override=libcurl/7.64.1 
--require-override=openssl/1.1.1s
       - name: Create Celix
         env:
           CC: ${{ matrix.compiler[0] }}
           CXX: ${{ matrix.compiler[1] }}
         run: |
-          conan inspect . -a options | awk 'BEGIN { FS="[\t:]+" } /build/ && 
!/build_all/ { print $1}' | while read option; do conan create . -b missing -o 
celix:${option}=True  -pr:b release -pr:h default -tf 
examples/conan_test_package -tbf test-build -o celix:celix_cxx17=True -o 
celix:celix_install_deprecated_api=True --require-override=libcurl/7.64.1 
--require-override=openssl/1.1.1s || exit 1; done
\ No newline at end of file
+          conan inspect . -a options | awk 'BEGIN { FS="[\t:]+" } /build/ && 
!/build_all/ { print $1}' | while read option; do conan create . -b missing -o 
celix:${option}=True  -pr:b release -pr:h default -tf 
examples/conan_test_package -tbf test-build -o celix:celix_cxx17=True -o 
celix:celix_install_deprecated_api=True --require-override=libcurl/7.64.1 
--require-override=openssl/1.1.1s --require-override=zlib/1.2.13 || exit 1; done
\ No newline at end of file