From ff265039c271be74fa93b4409c00553a5492d8bc Mon Sep 17 00:00:00 2001 From: PengZheng Date: Thu, 24 Aug 2023 12:19:34 +0800 Subject: [PATCH] Enable ninja for all conan build. --- .github/workflows/conan_create.yml | 3 +-- .github/workflows/coverage.yml | 2 +- .github/workflows/macos.yml | 2 +- conanfile.py | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conan_create.yml b/.github/workflows/conan_create.yml index 3b791fc7a..31cca7c8e 100644 --- a/.github/workflows/conan_create.yml +++ b/.github/workflows/conan_create.yml @@ -9,7 +9,7 @@ on: jobs: ubuntu-build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: @@ -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 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 6d4e85d8b..fa6301217 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v3.3.0 - 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: | diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2e95ab671..9fd3239bb 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v3.3.0 - name: Install conan run: | - brew install python + brew install python ninja pip3 install -U conan==1.59.0 - name: Setup Conan Profile run: | diff --git a/conanfile.py b/conanfile.py index 55f42b1f0..7a3ea4248 100644 --- a/conanfile.py +++ b/conanfile.py @@ -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: