cibuildwheel fixes

davidt0x · Jun 10, 2024 · 2c19f09 · 2c19f09
1 parent c21fd27
commit 2c19f09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,12 +31,8 @@ jobs:
         run: |
           brew install libomp llvm
           export CLANG_PREFIX=$(brew --prefix llvm)
-          export OMP_PREFIX=$(brew --prefix libomp)
           export CC=$CLANG_PREFIX/bin/clang
           export CXX=$CLANG_PREFIX/bin/clang++
-          export LDFLAGS="-L$CLANG_PREFIX/lib
-          -Wl,-rpath,$CLANG_PREFIX/lib $LDFLAGS -L$OMP_PREFIX/lib"
-          export CPPFLAGS="-I$CLANG_PREFIX/include $CPPFLAGS -I$OMP_PREFIX/include"
           ./pr-check.sh
       # - uses: codecov/codecov-action@v1
 
@@ -45,8 +41,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # os: [ubuntu-latest, windows-latest, macos-13, macos-14]
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4

diff --git a/pyproject.toml b/pyproject.toml
@@ -148,10 +148,11 @@ write_to = "brainiak/_version.py"
 [tool.cibuildwheel]
 test-requires = "pytest"
 test-command = "mpiexec -n 2 python -m mpi4py -m pytest {project}/tests"
+skip = ["*-win32", "pp*"]
 
 [tool.cibuildwheel.linux]
 before-all = [
-    "yum install mpich",
+    "yum -y install mpich",
 ]
 
 [tool.cibuildwheel.macos]