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 697e7ede Run gcov by GNU make.
697e7ede is described below
commit 697e7ede4b30406ff3851d54e5f4c1c31384f24f
Author: PengZheng <[email protected]>
AuthorDate: Thu Aug 24 13:32:29 2023 +0800
Run gcov by GNU make.
---
.github/workflows/conan_create.yml | 4 ++--
.github/workflows/coverage.yml | 4 ++--
.github/workflows/macos.yml | 2 +-
.github/workflows/ubuntu.yml | 2 +-
conanfile.py | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/conan_create.yml
b/.github/workflows/conan_create.yml
index 31cca7c8..47adadf2 100644
--- a/.github/workflows/conan_create.yml
+++ b/.github/workflows/conan_create.yml
@@ -35,7 +35,7 @@ jobs:
CC: ${{ matrix.compiler[0] }}
CXX: ${{ matrix.compiler[1] }}
run: |
- 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
+ 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 . -c
tools.cmake.cmaketoolchain:generator=Ninja -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
@@ -56,4 +56,4 @@ 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 default -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 . -a options | awk 'BEGIN { FS="[\t:]+" } /build/ &&
!/build_all/ { print $1}' | while read option; do conan create . -c
tools.cmake.cmaketoolchain:generator=Ninja -b missing -o celix:${option}=True
-pr:b default -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/coverage.yml b/.github/workflows/coverage.yml
index d8c6a148..6d4e85d8 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -11,7 +11,7 @@ jobs:
uses: actions/[email protected]
- name: Install conan and lcov
run: |
- sudo apt-get install -yq --no-install-recommends lcov ninja-build
+ sudo apt-get install -yq --no-install-recommends lcov
sudo pip install conan==1.59.0
- name: Setup Conan Profile
run: |
@@ -38,7 +38,7 @@ jobs:
run: |
cd build
source conanrun.sh
- ninja coverage
+ make coverage
source deactivate_conanrun.sh
lcx="lcov --output-file=coverage.info " && for i in `find . -name
"*.info.cleaned"`; do lcx+=" --add-tracefile=$i"; done && $lcx
- name: Codecov
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 9fd3239b..d20ac490 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -35,7 +35,7 @@ jobs:
-o celix:framework_curlinit=False
run: |
#force require 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 -b cpputest --require-override=libcurl/7.64.1
--require-override=openssl/1.1.1s
+ conan install . celix/ci -c
tools.cmake.cmaketoolchain:generator=Ninja -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
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 8f37382e..6839c032 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -55,7 +55,7 @@ jobs:
-o celix:framework_curlinit=False
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 -b cpputest
--require-override=libcurl/7.64.1 --require-override=openssl/1.1.1s
+ conan install . celix/ci -c
tools.cmake.cmaketoolchain:generator=Ninja -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] }}
diff --git a/conanfile.py b/conanfile.py
index 7a3ea424..55f42b1f 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -407,7 +407,7 @@ class CelixConan(ConanFile):
self.validate()
def generate(self):
- tc = CMakeToolchain(self, generator="Ninja")
+ tc = CMakeToolchain(self)
for opt in self._celix_defaults.keys():
tc.cache_variables[opt.upper()] = self.options.get_safe(opt)
if self.options.enable_testing:
