From 095fc0895e33038db1809dc77ebdb7dc3dadc125 Mon Sep 17 00:00:00 2001 From: Frankie Dintino Date: Sun, 24 Sep 2023 10:32:23 -0400 Subject: [PATCH] retry --- .github/workflows/wheels.yml | 211 ----------------------------------- winbuild/build_prepare.py | 9 +- 2 files changed, 6 insertions(+), 214 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index dbcc63c..ecec790 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -12,193 +12,6 @@ env: LIBAVIF_VERSION: 0.10.1 jobs: - build: - name: ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ "ubuntu-20.04", "macos-11" ] - python: [ "2.7", "3.7", "3.8", "3.9", "3.10", "3.11" ] - platform: [ "x86_64" ] - manylinux-version: [ "2010" ] - macos-target: [ "10.10" ] - mb-ml-libc: [ "manylinux" ] - multibuild-sha: [ "34e970c4bc448b73af0127615fc4583b4f247369" ] - exclude: - - python: "3.11" - manylinux-version: "2010" - - python: "3.11" - multibuild-sha: "34e970c4bc448b73af0127615fc4583b4f247369" - include: - - os: "macos-11" - os-name: "osx" - - os: "ubuntu-20.04" - manylinux-version: "2010" - os-name: "manylinux2010" - - os: "macos-11" - os-name: "osx" - platform: "arm64" - python: "3.10" - macos-target: "11.0" - - os: "macos-11" - os-name: "osx" - platform: "arm64" - python: "3.9" - macos-target: "11.0" - - os: "macos-11" - os-name: "osx" - platform: "arm64" - python: "3.8" - macos-target: "11.0" - - os: "macos-11" - os-name: "osx" - platform: "arm64" - python: "3.7" - macos-target: "11.0" - - os: "macos-11" - os-name: "osx" - 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.11" - platform: "x86_64" - os: "macos-11" - os-name: "osx" - macos-target: "10.10" - multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1" - - python: "3.11" - platform: "arm64" - os: "macos-11" - 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" - env: - BUILD_COMMIT: HEAD - PLAT: ${{ matrix.platform }} - MB_PYTHON_VERSION: ${{ matrix.python }} - TRAVIS_OS_NAME: ${{ matrix.os-name }} - MB_ML_VER: ${{ matrix.manylinux-version }} - MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }} - MB_ML_LIBC: ${{ matrix.mb-ml-libc }} - steps: - - uses: actions/checkout@v3 - with: - path: pillow-avif-plugin - - - name: Checkout dependencies - uses: actions/checkout@v3 - with: - repository: fdintino/pillow-avif-plugin-depends - path: pillow-avif-plugin-depends - - - name: Checkout multibuild - uses: actions/checkout@v3 - with: - repository: multi-build/multibuild - path: multibuild - ref: ${{ matrix.multibuild-sha }} - - - uses: actions/setup-python@v4 - with: - python-version: 3.9 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - if: ${{ matrix.platform == 'aarch64' }} - - - name: Setup env_vars - run: | - cat <<'EOF' >> env_vars.sh - export LIBAVIF_VERSION=${{ env.LIBAVIF_VERSION }}" - export GITHUB_ACTIONS=1" - EOF - - - name: Cache build - id: build-cache - uses: actions/cache@v3 - with: - path: pillow-avif-plugin/depends/libavif-${{ env.LIBAVIF_VERSION }} - key: - ${{ env.LIBAVIF_VERSION }}-${{ hashFiles('pillow-avif-plugin/wheelbuild/*.sh', 'pillow-avif-plugin/.github/workflows/wheels.yml', 'pillow-avif-plugin/depends/*') }}-${{ matrix.os }}-${{ matrix.platform }} - - - name: Cache ccache/sccache - uses: actions/cache@v3 - with: - path: | - ccache - sccache - key: - cache-${{ matrix.os }}-${{ matrix.os-name }}-${{ matrix.platform }}-${{ 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 }}-${{ matrix.platform }}-${{ 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 }}-${{ matrix.platform }}-${{ 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 }}-${{ matrix.platform }}- - - - name: Build Wheel - run: pillow-avif-plugin/wheelbuild/build.sh - - - name: Fix Directory Permissions - run: | - sudo chown -R $(whoami):$(id -ng) ccache ||: - sudo chown -R $(whoami):$(id -ng) sccache ||: - - - uses: actions/upload-artifact@v3 - with: - name: wheels - path: wheelhouse/*.whl windows: runs-on: windows-2019 @@ -364,27 +177,3 @@ jobs: with: name: wheels path: dist\*.whl - - success: - needs: [build, windows] - runs-on: ubuntu-20.04 - name: Build Successful - steps: - - name: Success - run: echo Build Successful - - release: - name: Create Release - runs-on: ubuntu-20.04 - if: "startsWith(github.ref, 'refs/tags/')" - needs: [build, windows] - steps: - - uses: actions/download-artifact@v3 - with: - name: wheels - - - name: Upload Release - uses: fnkr/github-action-ghr@v1.3 - env: - GHR_PATH: . - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index ba808a6..4ced813 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -165,7 +165,10 @@ def cmd_msbuild( "libs": [r"libpng16.lib"], }, "rav1e": { - "url": "https://github.com/xiph/rav1e/releases/download/v0.6.6/rav1e-0.6.6-windows-msvc-generic.zip", + "url": ( + "https://github.com/xiph/rav1e/releases/download/v0.6.6/" + "rav1e-0.6.6-windows-msvc-generic.zip" + ), "filename": "rav1e-0.6.6-windows-msvc-generic.zip", "dir": "rav1e-windows-msvc-sdk", "license": [], @@ -182,9 +185,9 @@ def cmd_msbuild( }, "license": "LICENSE", "build": [ - cmd_cd("ext"), - cmd_mkdir(r"rav1e\rav1e\build.libavif\usr"), + cmd_mkdir(r"ext\rav1e\rav1e\build.libavif"), cmd_xcopy(r"..\rav1e-windows-msvc-sdk", r"rav1e\rav1e\build.libavif\usr"), + cmd_cd("ext"), # cmd_rmdir("aom"), # 'cmd.exe /c "aom.cmd"', cmd_rmdir("dav1d"),