From 99d13840fcbe57da2edd642c5808944a526bfe4c Mon Sep 17 00:00:00 2001 From: Frankie Dintino Date: Sun, 14 Jul 2024 21:43:30 -0400 Subject: [PATCH] debug --- .github/workflows/wheels.yml | 111 ++++++++++++++++++----------------- wheelbuild/config.sh | 2 +- 2 files changed, 59 insertions(+), 54 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 9e860a1..8f42c41 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -19,51 +19,55 @@ 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: [ "ubuntu", "macos" ] + os-type: [ "macos" ] + python: [ "3.11" ] + # python: [ "2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12" ] + # arch: [ "x86", "arm" ] + 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", "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' }} @@ -113,18 +117,18 @@ jobs: # key: # ${{ env.LIBAVIF_VERSION }}-${{ hashFiles('pillow-avif-plugin/wheelbuild/*.sh', 'pillow-avif-plugin/.github/workflows/wheels.yml', 'pillow-avif-plugin/depends/*') }}-${{ matrix.os }}-${{ env.PLAT }} - - name: Cache ccache/sccache - uses: actions/cache@v3 - with: - path: | - ccache - sccache - key: - cache-${{ matrix.os }}-${{ matrix.os-name }}-${{ env.PLAT }}-${{ hashFiles('pillow-avif-plugin/wheelbuild/*.sh', 'pillow-avif-plugin/.github/workflows/wheels.yml', 'pillow-avif-plugin/depends/*', 'pillow-avif-plugin/**/*.py', 'pillow-avif-plugin/**/*.c') }}-${{ matrix.python }} - restore-keys: | - cache-${{ matrix.os }}-${{ matrix.os-name }}-${{ env.PLAT }}-${{ hashFiles('pillow-avif-plugin/wheelbuild/*.sh', 'pillow-avif-plugin/.github/workflows/wheels.yml', 'pillow-avif-plugin/depends/*', 'pillow-avif-plugin/**/*.py', 'pillow-avif-plugin/**/*.c') }}-${{ matrix.python }} - cache-${{ matrix.os }}-${{ matrix.os-name }}-${{ env.PLAT }}-${{ hashFiles('pillow-avif-plugin/wheelbuild/*.sh', 'pillow-avif-plugin/.github/workflows/wheels.yml', 'pillow-avif-plugin/depends/*', 'pillow-avif-plugin/**/*.py', 'pillow-avif-plugin/**/*.c') }} - cache-${{ matrix.os }}-${{ matrix.os-name }}-${{ env.PLAT }}- + # - name: Cache ccache/sccache + # uses: actions/cache@v3 + # with: + # path: | + # ccache + # sccache + # key: + # cache-${{ matrix.os }}-${{ matrix.os-name }}-${{ env.PLAT }}-${{ hashFiles('pillow-avif-plugin/wheelbuild/*.sh', 'pillow-avif-plugin/.github/workflows/wheels.yml', 'pillow-avif-plugin/depends/*', 'pillow-avif-plugin/**/*.py', 'pillow-avif-plugin/**/*.c') }}-${{ matrix.python }} + # restore-keys: | + # cache-${{ matrix.os }}-${{ matrix.os-name }}-${{ env.PLAT }}-${{ hashFiles('pillow-avif-plugin/wheelbuild/*.sh', 'pillow-avif-plugin/.github/workflows/wheels.yml', 'pillow-avif-plugin/depends/*', 'pillow-avif-plugin/**/*.py', 'pillow-avif-plugin/**/*.c') }}-${{ matrix.python }} + # cache-${{ matrix.os }}-${{ matrix.os-name }}-${{ env.PLAT }}-${{ hashFiles('pillow-avif-plugin/wheelbuild/*.sh', 'pillow-avif-plugin/.github/workflows/wheels.yml', 'pillow-avif-plugin/depends/*', 'pillow-avif-plugin/**/*.py', 'pillow-avif-plugin/**/*.c') }} + # cache-${{ matrix.os }}-${{ matrix.os-name }}-${{ env.PLAT }}- - name: Build Wheel run: pillow-avif-plugin/wheelbuild/build.sh @@ -141,6 +145,7 @@ jobs: windows: runs-on: windows-2019 + if: false strategy: fail-fast: false matrix: diff --git a/wheelbuild/config.sh b/wheelbuild/config.sh index ad4db89..d8b420c 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=RelWithDebInfo \ -DBUILD_SHARED_LIBS=OFF \ -DAVIF_LIBSHARPYUV=LOCAL \ -DAVIF_LIBYUV=LOCAL \