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 5ce50374 Add mac-build for conan create CI test.
5ce50374 is described below

commit 5ce503743081e2722f6152dfca0b5572b63b1581
Author: PengZheng <[email protected]>
AuthorDate: Sat Jul 15 13:38:22 2023 +0800

    Add mac-build for conan create CI test.
---
 .github/workflows/conan_create.yml | 23 ++++++++++++++++++++++-
 .github/workflows/macos.yml        |  3 ---
 .github/workflows/ubuntu.yml       |  6 ------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/conan_create.yml 
b/.github/workflows/conan_create.yml
index 0d05b862..a2c9c05d 100644
--- a/.github/workflows/conan_create.yml
+++ b/.github/workflows/conan_create.yml
@@ -44,4 +44,25 @@ jobs:
           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 --require-override=zlib/1.2.13 || 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
+
+  mac-build:
+    runs-on: macOS-11
+    timeout-minutes: 120
+    steps:
+      - name: Checkout source code
+        uses: actions/[email protected]
+      - name: Install conan
+        run: |
+          brew install python
+          pip3 install -U conan==1.59.0
+      - name: Setup Conan Profile
+        run: |
+          conan profile new default --detect
+          conan profile update settings.build_type=Release default
+      - 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 --require-override=zlib/1.2.13 || exit 1; done
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 263f8e61..965408d2 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -44,9 +44,6 @@ jobs:
           source activate_run.sh
           ctest --output-on-failure
           source deactivate_run.sh
-      - name: Test Installed Celix
-        run: |
-          conan create -pr:b default -pr:h default -tf 
examples/conan_test_package -tbf test-build -o celix:build_all=True -o 
celix:celix_cxx17=True -o celix:celix_install_deprecated_api=True 
--require-override=libcurl/7.64.1 --require-override=openssl/1.1.1s .
 
   build-brew:
     runs-on: macOS-11
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 2407824d..223f0da6 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -65,12 +65,6 @@ jobs:
           source activate_run.sh
           ctest --output-on-failure
           source deactivate_run.sh
-      - name: Test Installed Celix
-        env:
-          CC: ${{ matrix.compiler[0] }}
-          CXX: ${{ matrix.compiler[1] }}
-        run: |
-          conan create -pr:b release -pr:h default -tf 
examples/conan_test_package -tbf test-build -o celix:build_all=True -o 
celix:celix_cxx17=True -o celix:celix_install_deprecated_api=True 
--require-override=libcurl/7.64.1 --require-override=openssl/1.1.1s .
 
   build-apt:
     runs-on: ubuntu-22.04

Reply via email to