fixup

fdintino · Sep 11, 2023 · e803def · e803def
1 parent 624733c
commit e803def
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 57 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -18,7 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ "ubuntu-20.04", "macos-11" ]
+        # os: [ "ubuntu-20.04", "macos-11" ]
+        os: [ "macos-11" ]
         python: [ "2.7", "3.7", "3.8", "3.9", "3.10", "3.11" ]
         platform: [ "x86_64" ]
         manylinux-version: [ "2010" ]
@@ -33,9 +34,9 @@ jobs:
         include:
           - os: "macos-11"
             os-name: "osx"
-          - os: "ubuntu-20.04"
-            manylinux-version: "2010"
-            os-name: "manylinux2010"
+          # - os: "ubuntu-20.04"
+          #   manylinux-version: "2010"
+          #   os-name: "manylinux2010"
           - os: "macos-11"
             os-name: "osx"
             platform: "arm64"
@@ -61,39 +62,39 @@ jobs:
             platform: "arm64"
             python: "2.7"
             macos-target: "11.0"
-          - python: "3.8"
-            platform: "x86_64"
-            mb-ml-libc: "musllinux"
-            os: "ubuntu-20.04"
-            os-name: "musllinux"
-            manylinux-version: ""
-          - python: "3.9"
-            platform: "x86_64"
-            mb-ml-libc: "musllinux"
-            os: "ubuntu-20.04"
-            os-name: "musllinux"
-            manylinux-version: ""
-          - python: "3.10"
-            platform: "x86_64"
-            mb-ml-libc: "musllinux"
-            os: "ubuntu-20.04"
-            os-name: "musllinux"
-            manylinux-version: ""
-          - python: "3.8"
-            platform: "aarch64"
-            os: "ubuntu-20.04"
-            os-name: "manylinux2014"
-            manylinux-version: "2014"
-          - python: "3.9"
-            platform: "aarch64"
-            os: "ubuntu-20.04"
-            os-name: "manylinux2014"
-            manylinux-version: "2014"
-          - python: "3.10"
-            platform: "aarch64"
-            os: "ubuntu-20.04"
-            os-name: "manylinux2014"
-            manylinux-version: "2014"
+          # - python: "3.8"
+          #   platform: "x86_64"
+          #   mb-ml-libc: "musllinux"
+          #   os: "ubuntu-20.04"
+          #   os-name: "musllinux"
+          #   manylinux-version: ""
+          # - python: "3.9"
+          #   platform: "x86_64"
+          #   mb-ml-libc: "musllinux"
+          #   os: "ubuntu-20.04"
+          #   os-name: "musllinux"
+          #   manylinux-version: ""
+          # - python: "3.10"
+          #   platform: "x86_64"
+          #   mb-ml-libc: "musllinux"
+          #   os: "ubuntu-20.04"
+          #   os-name: "musllinux"
+          #   manylinux-version: ""
+          # - python: "3.8"
+          #   platform: "aarch64"
+          #   os: "ubuntu-20.04"
+          #   os-name: "manylinux2014"
+          #   manylinux-version: "2014"
+          # - python: "3.9"
+          #   platform: "aarch64"
+          #   os: "ubuntu-20.04"
+          #   os-name: "manylinux2014"
+          #   manylinux-version: "2014"
+          # - python: "3.10"
+          #   platform: "aarch64"
+          #   os: "ubuntu-20.04"
+          #   os-name: "manylinux2014"
+          #   manylinux-version: "2014"
           - python: "3.11"
             platform: "x86_64"
             os: "macos-11"
@@ -106,25 +107,25 @@ jobs:
             os-name: "osx"
             macos-target: "11.0"
             multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
-          - python: "3.11"
-            platform: "x86_64"
-            mb-ml-libc: "musllinux"
-            os: "ubuntu-20.04"
-            os-name: "musllinux"
-            manylinux-version: ""
-            multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
-          - python: "3.11"
-            platform: "aarch64"
-            os: "ubuntu-20.04"
-            os-name: "manylinux2014"
-            manylinux-version: "2014"
-            multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
-          - python: "3.11"
-            platform: "x86_64"
-            os: "ubuntu-20.04"
-            os-name: "manylinux2014"
-            manylinux-version: "2014"
-            multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
+          # - python: "3.11"
+          #   platform: "x86_64"
+          #   mb-ml-libc: "musllinux"
+          #   os: "ubuntu-20.04"
+          #   os-name: "musllinux"
+          #   manylinux-version: ""
+          #   multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
+          # - python: "3.11"
+          #   platform: "aarch64"
+          #   os: "ubuntu-20.04"
+          #   os-name: "manylinux2014"
+          #   manylinux-version: "2014"
+          #   multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
+          # - python: "3.11"
+          #   platform: "x86_64"
+          #   os: "ubuntu-20.04"
+          #   os-name: "manylinux2014"
+          #   manylinux-version: "2014"
+          #   multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
     env:
       BUILD_COMMIT: HEAD
       PLAT: ${{ matrix.platform }}

diff --git a/wheelbuild/config.sh b/wheelbuild/config.sh
@@ -381,7 +381,7 @@ function build_libsharpyuv {
         && ninja sharpyuv)
 
     if [ -n "$IS_MACOS" ]; then
-        brew uninstall webp
+        # brew uninstall webp
         CP="sudo cp"
         MKDIR="sudo mkdir"
     else
@@ -440,6 +440,10 @@ function build_libyuv {
 function build_libavif {
     LIBAVIF_CMAKE_FLAGS=()
 
+    if [ -n "$IS_MACOS" ]; then
+        brew uninstall webp jpeg-xl
+    fi
+
     build_aom
     LIBAVIF_CMAKE_FLAGS+=(-DAVIF_CODEC_AOM=ON)