From b768ac75983cae4dab233f7fc8c11c8b1d0a9c1d Mon Sep 17 00:00:00 2001 From: nanake Date: Wed, 29 Nov 2023 11:02:10 +0900 Subject: [PATCH] hwaccels Signed-off-by: nanake --- .github/workflows/CI.yml | 50 +--------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2c129ef3..9b9e9525 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -8,56 +8,8 @@ on: workflow_dispatch: jobs: - build_targets: - name: Build target-variant image - runs-on: ubuntu-22.04 - strategy: - fail-fast: false - matrix: - target: [win32, win64] - variant: [nonfree] - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@master - with: - version: v0.12.0 - config-inline: | - [worker.oci] - max-parallelism = 2 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.dodosolsollalasol }} - - - name: Generate Dockerfile - run: ./generate.sh ${{ matrix.target }} ${{ matrix.variant }} - - - name: Image Name - id: imagename - run: | - IMG="ghcr.io/${GITHUB_ACTOR,,}/${{ matrix.target }}-${{ matrix.variant }}" - echo "image=${IMG/ /-}:latest" >> $GITHUB_OUTPUT - echo "cache=${IMG/ /-}:cache" >> $GITHUB_OUTPUT - - - name: Build variant image - uses: docker/build-push-action@v5 - with: - context: . - outputs: type=registry,oci-mediatypes=true,compression=zstd,compression-level=7 - cache-from: type=registry,ref=${{ steps.imagename.outputs.cache }} - cache-to: type=registry,ref=${{ steps.imagename.outputs.cache }},mode=max,oci-mediatypes=true,compression=zstd,compression-level=7 - tags: ${{ steps.imagename.outputs.image }} - provenance: false - build_ffmpeg: name: Build ffmpeg - needs: build_targets runs-on: ubuntu-22.04 strategy: fail-fast: false @@ -76,7 +28,7 @@ jobs: password: ${{ secrets.dodosolsollalasol }} - name: Build ffmpeg - run: ./build.sh ${{ matrix.target }} ${{ matrix.variant }} + run: FFMPEG_REPO_OVERRIDE=https://github.com/nanake/FFmpeg.git GIT_BRANCH_OVERRIDE=hwaccels ./build.sh ${{ matrix.target }} ${{ matrix.variant }} - name: Upload artifacts uses: actions/upload-artifact@v3