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

pengzheng pushed a commit to branch feature/483-conan-2-support
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/feature/483-conan-2-support by 
this push:
     new af027163 Use Conan2 for conan_create/ubuntu-build
af027163 is described below

commit af027163eaf4040e364210183e35168ebe40849c
Author: PengZheng <[email protected]>
AuthorDate: Wed Aug 23 15:28:51 2023 +0800

    Use Conan2 for conan_create/ubuntu-build
---
 .github/workflows/conan_create.yml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/conan_create.yml 
b/.github/workflows/conan_create.yml
index 655a5fc8..748d145a 100644
--- a/.github/workflows/conan_create.yml
+++ b/.github/workflows/conan_create.yml
@@ -14,14 +14,14 @@ jobs:
       fail-fast: false
       matrix:
         compiler: [ [gcc,g++], [clang,clang++] ]
-        type: [ Debug ]
+        type: [ Release ]
     timeout-minutes: 120
     steps:
       - name: Checkout source code
         uses: actions/[email protected]
       - name: Install build dependencies
         run: |
-          sudo pip install -U conan==1.59.0
+          sudo pip install -U conan
           sudo apt-get install -yq --no-install-recommends ninja-build
       - name: Setup Conan Profile
         env:
@@ -29,24 +29,14 @@ jobs:
           CXX: ${{ matrix.compiler[1] }}
         run: |
           # build profile
-          conan profile new release --detect
-          conan profile update settings.build_type=Release release
-          #Note no backwards compatiblity for gcc5 needed, setting libcxx to 
c++11.
-          conan profile update settings.compiler.libcxx=libstdc++11 release
-          conan profile show release
-          # host profile
           conan profile new default --detect
-          conan profile update settings.build_type=${{ matrix.type }} default
-          #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
+          echo tools.cmake.cmaketoolchain:generator=Ninja >> 
~\.conan2\global.conf
       - name: Create Celix
         env:
           CC: ${{ matrix.compiler[0] }}
           CXX: ${{ matrix.compiler[1] }}
-          CONAN_CMAKE_GENERATOR: Ninja
         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 --require-override=zlib/1.2.13 || exit 1; done
+          conan inspect .  | awk 'BEGIN { FS="[\t:]+"; output=0 } /build/ && 
!/build_all/ { if(output) print $1} /^options/ {output=1} 
/^options_definitions/ {output=0}' | while read option; do conan create . -b 
missing -o celix/*:${option}=True  -pr:b default -pr:h default -s:h 
build_type=${{ matrix.type }} -tf examples/conan_test_package_v2 -o 
celix/*:celix_cxx17=True -o celix/*:celix_install_deprecated_api=True || exit 
1; done
 
   mac-build:
     runs-on: macOS-11

Reply via email to