diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 9e860a1..986e86e 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -19,51 +19,52 @@ jobs: strategy: fail-fast: false matrix: - os-type: [ "ubuntu", "macos" ] - python: [ "2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12" ] - arch: [ "x86", "arm" ] + os-type: [ "macos" ] + # python: [ "2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12" ] + python: [ "3.11" ] + arch: [ "arm" ] manylinux-version: [ "2014" ] - mb-ml-libc: [ "manylinux", "musllinux" ] - exclude: - - python: "2.7" - os-type: "ubuntu" - manylinux-version: "2014" - - python: "3.7" - os-type: "ubuntu" - manylinux-version: "2014" - - python: "2.7" - os-type: "ubuntu" - arch: "arm" - - python: "2.7" - mb-ml-libc: "musllinux" - - python: "3.7" - mb-ml-libc: "musllinux" - - arch: "arm" - mb-ml-libc: "musllinux" - - os-type: "macos" - mb-ml-libc: "musllinux" + mb-ml-libc: [ "manylinux" ] + # exclude: + # - python: "2.7" + # os-type: "ubuntu" + # manylinux-version: "2014" + # - python: "3.7" + # os-type: "ubuntu" + # manylinux-version: "2014" + # - python: "2.7" + # os-type: "ubuntu" + # arch: "arm" + # - python: "2.7" + # mb-ml-libc: "musllinux" + # - python: "3.7" + # mb-ml-libc: "musllinux" + # - arch: "arm" + # mb-ml-libc: "musllinux" + # - os-type: "macos" + # mb-ml-libc: "musllinux" include: - os-type: "macos" os-name: "macOS" - - os-type: "ubuntu" - os: "ubuntu-latest" - python: "2.7" - arch: "x86" - manylinux-version: "2010" - os-name: "manylinux2010" - - os-type: "ubuntu" - os: "ubuntu-latest" - python: "3.7" - arch: "x86" - manylinux-version: "2010" - os-name: "manylinux2010" - - os-type: "ubuntu" - os: "ubuntu-latest" - manylinux-version: "2014" - os-name: "manylinux2014" - - mb-ml-libc: "musllinux" - os-type: "ubuntu" - os-name: "musllinux" + # - os-type: "ubuntu" + # os: "ubuntu-latest" + # python: "2.7" + # arch: "x86" + # manylinux-version: "2010" + # os-name: "manylinux2010" + # - os-type: "ubuntu" + # os: "ubuntu-latest" + # python: "3.7" + # arch: "x86" + # manylinux-version: "2010" + # os-name: "manylinux2010" + # - os-type: "ubuntu" + # os: "ubuntu-latest" + # manylinux-version: "2014" + # os-name: "manylinux2014" + # - mb-ml-libc: "musllinux" + # os-type: "ubuntu" + # os-name: "musllinux" env: BUILD_COMMIT: HEAD PLAT: ${{ matrix.arch == 'x86' && 'x86_64' || (matrix.os-type == 'macos' && 'arm64') || 'aarch64' }} @@ -144,7 +145,8 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + # python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.7"] architecture: ["x64"] include: - architecture: "x64" diff --git a/wheelbuild/build.sh b/wheelbuild/build.sh index 7157bfc..6fffc5a 100755 --- a/wheelbuild/build.sh +++ b/wheelbuild/build.sh @@ -40,7 +40,7 @@ echo "::group::Setup wheel installation" echo "::endgroup::" echo "::group::Test wheel" - if [ "${PLAT}" == "arm64" ] && [ $(arch) != "arm64" ]; then + if [ "${PLAT}" == "arm64" ]; then echo "Skipping tests for non-natively-built Apple Silicon wheel" elif [[ "$MB_ML_LIBC" == "musllinux" ]] && [[ "$MB_PYTHON_VERSION" != "3.11" ]]&& [[ "$MB_PYTHON_VERSION" != "3.11" ]]; then echo "Skipping tests for CI issue with musl python < 3.11" diff --git a/wheelbuild/config.sh b/wheelbuild/config.sh index e158aeb..d25e66b 100644 --- a/wheelbuild/config.sh +++ b/wheelbuild/config.sh @@ -288,7 +288,7 @@ EOF && cmake .. \ -G "Ninja" \ -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=Debug \ -DBUILD_SHARED_LIBS=OFF \ -DAVIF_LIBSHARPYUV=LOCAL \ -DAVIF_LIBYUV=LOCAL \