attempting to add macos to pyuda wheel builds

stephen-dixon · Apr 15, 2024 · f2105e2 · f2105e2
1 parent 3984f7d
commit f2105e2
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -77,7 +77,7 @@ jobs:
             ./bootstrap.sh --prefix=/usr/local  &&
             ./b2 --without-python --prefix=/usr/local install &&
             cd /project  &&
-            cmake -B build -DBUILD_SHARED_LIBS=ON -DSSLAUTHENTICATION=OFF -DENABLE_CAPNP=ON -DCLIENT_ONLY=ON &&
+            cmake -B build -DNO_JAVA_WRAPPER=ON -DNO_CXX_WRAPPER=ON -DBUILD_SHARED_LIBS=ON -DSSLAUTHENTICATION=OFF -DENABLE_CAPNP=ON -DCLIENT_ONLY=ON &&
             cmake --build build -j --config Release --target install &&
             cp -r /usr/local/python_installer/* /project/source/wrappers/python/ &&
             sed -i 's|\[tool\.setuptools_scm\]|\[tool\.setuptools_scm\]\nroot =\"\/project\"|g' /project/source/wrappers/python/pyproject.toml
@@ -105,6 +105,7 @@ jobs:
             -DBUILD_SHARED_LIBS=ON 
             -DCMAKE_BUILD_TYPE=Release 
             -DSSLAUTHENTICATION=OFF 
+            -DNO_JAVA_WRAPPER=ON -DNO_CXX_WRAPPER=ON 
             -DENABLE_CAPNP=ON -DCLIENT_ONLY=ON &&
             cmake --build build -j --config Release --target install &&
             cp -r /usr/local/python_installer/* /project/source/wrappers/python/ &&
@@ -114,6 +115,29 @@ jobs:
           name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
+      - name: build uda on macos
+        if: runner.os == 'macOS'
+        run: >
+          brew update-reset && brew install
+          git
+          boost
+          openssl
+          cmake
+          libxml2
+          spdlog
+          capnp &&
+          cd ${{github.workspace}} &&
+          cmake -B build 
+          -DBUILD_SHARED_LIBS=ON 
+          -DCMAKE_BUILD_TYPE=Release 
+          -DSSLAUTHENTICATION=OFF 
+          -DENABLE_CAPNP=ON 
+          -DNO_JAVA_WRAPPER=ON -DNO_CXX_WRAPPER=ON
+          -DCLIENT_ONLY=ON &&
+          cmake --build build -j --config Release --target install &&
+          cp -r /usr/local/python_installer/* ${{github.workspace}}/source/wrappers/python/ &&
+          sed -i temp.bak "s|\[tool\.setuptools_scm\]|\[tool\.setuptools_scm\]\nroot =\"${{github.workspace}}\"|g" ${{github.workspace}}/source/wrappers/python/pyproject.toml
+
 
       - name: Build macos wheels
         if: runner.os == 'macOS'
@@ -123,28 +147,9 @@ jobs:
           config-file: ./source/wrappers/python/pyproject.toml
         env:
           CIBW_ARCHS: ${{matrix.build-platform[1]}}
+          CIBW_PLATFORM: macos
           CIBW_BUILD: cp*-${{matrix.build-platform[2]}}
           CIBW_SKIP: cp36* cp37* 
-          CIBW_BEFORE_ALL: >
-            brew update-reset && brew install
-            git
-            boost
-            openssl
-            cmake
-            pkg-config
-            libxml2
-            spdlog
-            capnp &&
-            cd ${{github.workspace}} &&
-            cmake -B build 
-            -DBUILD_SHARED_LIBS=ON 
-            -DCMAKE_BUILD_TYPE=Release 
-            -DSSLAUTHENTICATION=OFF 
-            -DENABLE_CAPNP=ON 
-            -DCLIENT_ONLY=ON &&
-            cmake --build build -j --config Release --target install &&
-            cp -r /usr/local/python_installer/* ${{github.workspace}}/source/wrappers/python/ &&
-            sed -i temp.bak "s|\[tool\.setuptools_scm\]|\[tool\.setuptools_scm\]\nroot =\"${{github.workspace}}\"|g" ${{github.workspace}}/source/wrappers/python/pyproject.toml
       - uses: actions/upload-artifact@v4
         with:
           name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}