diff --git a/.github/workflows/build-wheels-cibuildwheel.yml b/.github/workflows/build-wheels-cibuildwheel.yml index 3b840e899..7914d7195 100644 --- a/.github/workflows/build-wheels-cibuildwheel.yml +++ b/.github/workflows/build-wheels-cibuildwheel.yml @@ -23,7 +23,7 @@ jobs: with: config-file: ${{ matrix.config }} env: - CIBW_ARCHS_MACOS: x86_64 arm64 + CIBW_ARCHS_MACOS: arm64 x86_64 - uses: actions/upload-artifact@v3 with: diff --git a/pyproject-tensorflow.toml b/pyproject-tensorflow.toml index 83684f38f..e3240e823 100644 --- a/pyproject-tensorflow.toml +++ b/pyproject-tensorflow.toml @@ -43,9 +43,10 @@ test-command = "python -c 'import essentia; import essentia.standard; import ess select = "*macosx_arm64*" before-build = [ - "brew install pkg-config gcc readline sqlite gdbm freetype libpng", - "brew install eigen libyaml fftw ffmpeg@2.8 libsamplerate libtag chromaprint", - "brew install tensorflow", + "brew install ", + "PACKAGES=(eigen libyaml fftw ffmpeg@2.8 libsamplerate libtag chromaprint); for PACKAGE in \"${PACKAGES[@]}\"; do brew fetch --force --bottle-tag=arm64_monterrey $PACKAGE; result=$(brew --cache --bottle-tag=arm64_monterrey $PACKAGE) brew install $result; done" + "PACKAGES=(pkg-config gcc readline sqlite gdbm freetype libpng); for PACKAGE in \"${PACKAGES[@]}\"; do brew fetch --force --bottle-tag=arm64_monterrey $PACKAGE; result=$(brew --cache --bottle-tag=arm64_monterrey $PACKAGE) brew install $result; done" + "PACKAGES=(tensorflow); for PACKAGE in \"${PACKAGES[@]}\"; do brew fetch --force --bottle-tag=arm64_monterrey $PACKAGE; result=$(brew --cache --bottle-tag=arm64_monterrey $PACKAGE) brew install $result; done" "brew link --force ffmpeg@2.8", "python waf configure --with-tensorflow --pkg-config-path=\"${PKG_CONFIG_PATH}\" --arch arm64 --no-msse", "python waf", diff --git a/pyproject.toml b/pyproject.toml index b9c9e27ab..630fb2b42 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,8 +41,8 @@ test-command = "python -c 'import essentia; import essentia.standard; import ess select = "*macosx_arm64*" before-build = [ - "brew install pkg-config gcc readline sqlite gdbm freetype libpng", - "brew install eigen libyaml fftw ffmpeg@2.8 libsamplerate libtag chromaprint", + "PACKAGES=(eigen libyaml fftw ffmpeg@2.8 libsamplerate libtag chromaprint); for PACKAGE in \"${PACKAGES[@]}\"; do brew fetch --force --bottle-tag=arm64_monterrey $PACKAGE; result=$(brew --cache --bottle-tag=arm64_monterrey $PACKAGE) brew install $result; done" + "PACKAGES=(pkg-config gcc readline sqlite gdbm freetype libpng); for PACKAGE in \"${PACKAGES[@]}\"; do brew fetch --force --bottle-tag=arm64_monterrey $PACKAGE; result=$(brew --cache --bottle-tag=arm64_monterrey $PACKAGE) brew install $result; done" "brew link --force ffmpeg@2.8", "python waf configure --pkg-config-path=\"${PKG_CONFIG_PATH}\" --arch arm64 --no-msse", "python waf",