Skip to content

Commit

Permalink
feat build: test Conan package on MacOS
Browse files Browse the repository at this point in the history
Tests: протестировано CI

Pull Request resolved: #763
commit_hash:3af0491596c982ee8a3d1d236c350a05bf182188
  • Loading branch information
apolukhin committed Nov 13, 2024
1 parent 3f0c0bc commit eb2e12e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
include:
- os: ubuntu-22.04
conanflags: '-tf conan/test_package/'
conanflags: ''
- os: macos-latest
conanflags: ''

Expand Down Expand Up @@ -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/
3 changes: 2 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# pylint: disable=no-member
import os
import platform
import re

from conan import ConanFile
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit eb2e12e

Please sign in to comment.