diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml index 067b9231..70c3dd56 100644 --- a/.github/workflows/build-ffmpeg.yml +++ b/.github/workflows/build-ffmpeg.yml @@ -27,7 +27,7 @@ jobs: run: python scripts/cache.py - name: Cache tarballs id: cache-tarballs - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: source key: tarballs-${{ hashFiles('cache.txt') }} @@ -165,7 +165,7 @@ jobs: cibuildwheel --output-dir output rm -f output/*.whl - name: Upload FFmpeg - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: output-${{ matrix.build }}${{ matrix.arch }} path: output/ @@ -178,12 +178,12 @@ jobs: contents: write steps: - name: Download all artifacts - uses: actions/download-artifact@v6 + uses: actions/download-artifact@v8 with: path: artifacts/ pattern: output-* merge-multiple: true - name: Upload to release - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@v3 with: files: artifacts/*.tar.gz diff --git a/scripts/pkg.py b/scripts/pkg.py index 099e59dd..54330ad1 100644 --- a/scripts/pkg.py +++ b/scripts/pkg.py @@ -135,7 +135,7 @@ def __lt__(self, other): sha256="6eeb82934e69fd51e043bd8c5b0d152839638d1ce7aa4eea65a3fedcf83ff224", # assembly contains textrels which are not supported by musl build_arguments=( - "--disable-cli --disable-lsmash --disable-swscale --disable-ffms --enable-strip" + (" --disable-asm" if is_musllinux else "") + "--disable-cli --disable-lsmash --disable-swscale --disable-ffms --disable-opencl --enable-strip" + (" --disable-asm" if is_musllinux else "") ).split(" "), ), Package(