diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index b28b650..40f2cde 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -3,16 +3,16 @@ name: Build on: pull_request: branches: - - "**" + - master jobs: build_wheels: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: -# os: [ubuntu-latest, macos-13, macos-14] currently only works on Linux - os: [ubuntu-latest] + os: [ubuntu-latest, macos-13, macos-14] steps: - name: Checkout the repository diff --git a/.github/workflows/deploy_test_pypi.yml b/.github/workflows/deploy_test_pypi.yml index 566f7e1..902f8cc 100644 --- a/.github/workflows/deploy_test_pypi.yml +++ b/.github/workflows/deploy_test_pypi.yml @@ -2,7 +2,7 @@ name: Test PyPI deploy on: push: branches: - - "**" + - master jobs: generate_version: diff --git a/CMakeLists.txt b/CMakeLists.txt index b0c42f1..21940d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,9 +22,13 @@ project( add_link_options(-lgmp) -add_subdirectory(src/swisspair_cpp) +# macos stuff +include_directories(/opt/homebrew/include) +link_directories(/opt/homebrew/lib) + add_subdirectory(src/swisspair_cpp/gmpwrap) add_subdirectory(src/swisspair_cpp/Minimum-Cost-Perfect-Matching) +add_subdirectory(src/swisspair_cpp) # Find the module development requirements (requires FindPython from 3.17 or # scikit-build-core's built-in backport) diff --git a/pyproject.toml b/pyproject.toml index ed92060..7c09908 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,3 +19,8 @@ requires=[] before-all = """ yum -y install gmp-devel || apk add gmp-dev """ + +[tool.cibuildwheel.macos] +before-all = """ +brew install gmp pkg-config +""" diff --git a/src/swisspair_cpp b/src/swisspair_cpp index 50e03ac..f74dd87 160000 --- a/src/swisspair_cpp +++ b/src/swisspair_cpp @@ -1 +1 @@ -Subproject commit 50e03ac1ca32337e643aca31989187ab98ff5616 +Subproject commit f74dd87156e98b26a067c759b43b1c0648796d5f