diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index ceb5bcfa969..f3a8b8f25d3 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -2,8 +2,15 @@ # Define custom utilities # Test for macOS with [ -n "$IS_MACOS" ] source wheels/multibuild/common_utils.sh -source wheels/multibuild/library_builders.sh +PLAT="x86_64" source wheels/multibuild/library_builders.sh if [ -z "$IS_MACOS" ]; then + export MB_ML_LIBC=$(echo $AUDITWHEEL_PLAT | cut -f 1 -d _) + export MB_ML_VER="_"$(echo $AUDITWHEEL_PLAT | cut -f 2- -d _) + echo "torch" + echo $AUDITWHEEL_PLAT + echo MB_ML_LIBC + echo MB_ML_VER + exit 1 source wheels/multibuild/manylinux_utils.sh fi @@ -94,7 +101,10 @@ if [ -n "$IS_MACOS" ]; then build_simple xorgproto 2023.2 https://www.x.org/pub/individual/proto build_simple libXau 1.0.11 https://www.x.org/pub/individual/lib build_simple libpthread-stubs 0.5 https://xcb.freedesktop.org/dist - cp venv/share/pkgconfig/xcb-proto.pc venv/lib/pkgconfig/xcb-proto.pc + ls -la /Library/Frameworks/Python.framework/Versions + ls -la /Library/Frameworks/Python.framework/Versions/Current + ls -la /Library/Frameworks/Python.framework/Versions/Current/share/pkgconfig/xcb-proto.pc + cp /Library/Frameworks/Python.framework/Versions/Current/share/pkgconfig/xcb-proto.pc /Library/Frameworks/Python.framework/Versions/Current/lib/pkgconfig else sed s/\${pc_sysrootdir\}// /usr/local/share/pkgconfig/xcb-proto.pc > /usr/local/lib/pkgconfig/xcb-proto.pc fi diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 4ef598675fb..f5f9af79e8e 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -13,7 +13,10 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest] + os: [ + ubuntu-latest, + macos-latest + ] steps: - uses: actions/checkout@v4 with: