From a77d4e4c0972258545af4787859003d3947f01cb Mon Sep 17 00:00:00 2001 From: Kevin Pfeifer Date: Sat, 6 Jul 2024 02:03:21 +0000 Subject: [PATCH] remove duplicate steps --- .github/workflows/build-ffmpeg.yml | 64 ------------------------------ 1 file changed, 64 deletions(-) diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml index 0880cd58c7..d3a51ee317 100644 --- a/.github/workflows/build-ffmpeg.yml +++ b/.github/workflows/build-ffmpeg.yml @@ -257,70 +257,6 @@ jobs: name: android-${{ matrix.arch }} path: android-${{ matrix.arch }} - build-linux-cross: - name: Build Linux - # Use 20.04 to target glibc 2.31 like the other native libs - runs-on: ubuntu-20.04 - strategy: - matrix: - include: - - { arch: x86, container: "i386/ubuntu:20.04" } - - { arch: arm64, container: "arm64v8/ubuntu:20.04" } - - { arch: arm, container: "arm32v7/ubuntu:20.04" } - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup QEMU - if: ${{ contains(matrix.arch, 'arm') }} - uses: docker/setup-qemu-action@v2 - - - name: Build - uses: addnab/docker-run-action@v3 - with: - image: ${{ matrix.container }} - options: -v ${{ github.workspace }}:/workspace -w /workspace -e DEBIAN_FRONTEND=noninteractive - run: | - apt-get update -y -qq - apt-get install -y build-essential curl - if [ "$(dpkg --print-architecture)" = "i386" ]; then - apt-get install -y nasm - fi - - osu.Framework.NativeLibs/scripts/ffmpeg/build-linux.sh - - - name: Upload - uses: actions/upload-artifact@v4 - with: - name: linux-${{ matrix.arch }} - path: linux-${{ matrix.arch }} - - build-android: - name: Build Android - runs-on: ubuntu-22.04 - strategy: - matrix: - arch: - - armeabi-v7a - - arm64-v8a - - x86 - - x86_64 - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Build - run: osu.Framework.NativeLibs/scripts/ffmpeg/build-android.sh - env: - arch: ${{ matrix.arch }} - - - name: Upload - uses: actions/upload-artifact@v4 - with: - name: linux-x64 - path: linux-x64 - make-pr: name: Create pull request runs-on: ubuntu-22.04