Fix ci

.github/workflows/release.yaml

@@ -28,20 +28,26 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [macos-latest, windows-latest, ubuntu-latest, macos-13]
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
       - uses: actions/setup-python@v5
         with:
           python-version: '3.9'
-      - name: Build wheels
+      - name: Build wheels on non M1 macOS machine
         uses: pypa/[email protected]
+        if: matrix.os != 'macos-latest'
         env:
-          CIBW_ARCHS_MACOS: "x86_64 arm64"
+          CIBW_ARCHS_MACOS: x86_64
           CIBW_ARCHS_WINDOWS: AMD64
           CIBW_ARCHS_LINUX: x86_64
+      - name: Build wheels on M1 macOS machine
+        uses: pypa/[email protected]
+        if: matrix.os == 'macos-latest'
+        env:
+          CIBW_ARCHS_MACOS: arm64
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
@@ -65,7 +71,7 @@ jobs:
       - name: Generate artifact attestation for sdist and wheels
         uses: actions/attest-build-provenance@v1
         with:
-          subject-path: "dist/*"
+          subject-path: 'dist/*'
       - name: Publish package to pypi
         uses: pypa/gh-action-pypi-publish@release/v1
         with:

.github/workflows/test-pypi.yaml

@@ -48,18 +48,18 @@ jobs:
         run: python script.py version ${{ github.event.inputs.package_version }}
       - name: Build wheels on non M1 macOS machine
         uses: pypa/[email protected]
-        if: ${{ matrix.os }} != 'macos-latest'
+        if: matrix.os != 'macos-latest'
         env:
           CIBW_BUILD: cp312-*
-          CIBW_ARCHS_MACOS: 'x86_64'
+          CIBW_ARCHS_MACOS: x86_64
           CIBW_ARCHS_WINDOWS: AMD64
           CIBW_ARCHS_LINUX: x86_64
       - name: Build wheels on M1 macOS machine
         uses: pypa/[email protected]
-        if: ${{ matrix.os }} == 'macos-latest'
+        if: matrix.os == 'macos-latest'
         env:
           CIBW_BUILD: cp312-*
-          CIBW_ARCHS_MACOS: 'arm64'
+          CIBW_ARCHS_MACOS: arm64
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:

CMakeLists.txt

@@ -20,7 +20,10 @@ pybind11_add_module(_iphreeqc MODULE "${CMAKE_SOURCE_DIR}/src/main.cpp")
 
 add_dependencies(_iphreeqc IPhreeqcBuild)
 
-target_link_directories(_iphreeqc PRIVATE "${CMAKE_SOURCE_DIR}/iphreeqc-install/lib")
+target_link_directories(_iphreeqc 
+    PRIVATE "${CMAKE_SOURCE_DIR}/iphreeqc-install/lib"
+    PRIVATE "${CMAKE_SOURCE_DIR}/iphreeqc-install/lib64"
+)
 
 target_include_directories(_iphreeqc PRIVATE "${CMAKE_SOURCE_DIR}/iphreeqc-install/include")