diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 933c245ce561..2e1866c71859 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -20,7 +20,7 @@ jobs: matrix: include: - os: ubuntu-22.04 - conanflags: '-tf conan/test_package/' + conanflags: '' - os: macos-latest conanflags: '' @@ -50,4 +50,4 @@ jobs: - name: Run conan run: | - conan create . --build=missing -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}} + conan create . --build=missing -s:a compiler.cppstd=17 -pr:b=default ${{matrix.conanflags}} -tf conan/test_package/ diff --git a/conanfile.py b/conanfile.py index 1e739d90d9a5..7fb8d3637877 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,5 +1,6 @@ # pylint: disable=no-member import os +import platform import re from conan import ConanFile @@ -47,7 +48,7 @@ class UserverConan(ConanFile): default_options = { 'fPIC': True, 'lto': False, - 'with_jemalloc': True, + 'with_jemalloc': (platform.system() != 'Darwin'), 'with_mongodb': True, 'with_postgresql': True, 'with_postgresql_extra': False,