Skip to content

Commit

Permalink
Enable ninja for all conan build.
Browse files Browse the repository at this point in the history
  • Loading branch information
PengZheng committed Aug 24, 2023
1 parent 2e48484 commit ff26503
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/conan_create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:

ubuntu-build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -55,6 +55,5 @@ jobs:
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 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
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
uses: actions/[email protected]
- name: Install conan and lcov
run: |
sudo apt-get install -yq --no-install-recommends lcov
sudo apt-get install -yq --no-install-recommends lcov ninja-build
sudo pip install conan==1.59.0
- name: Setup Conan Profile
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/[email protected]
- name: Install conan
run: |
brew install python
brew install python ninja
pip3 install -U conan==1.59.0
- name: Setup Conan Profile
run: |
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ def requirements(self):
self.validate()

def generate(self):
tc = CMakeToolchain(self)
tc = CMakeToolchain(self, generator="Ninja")
for opt in self._celix_defaults.keys():
tc.cache_variables[opt.upper()] = self.options.get_safe(opt)
if self.options.enable_testing:
Expand Down

0 comments on commit ff26503

Please sign in to comment.