diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml index a5c49d3..b7c1002 100644 --- a/.github/workflows/ffmpeg.yml +++ b/.github/workflows/ffmpeg.yml @@ -3,23 +3,6 @@ name: 'Build FFmpeg' on: workflow_dispatch: inputs: - env: - type: choice - required: true - default: 'windows-2022' - description: 'Environment' - options: - - windows-2022 - - source: - type: choice - required: true - default: 'ffmpeg' - description: Source - options: - - ffmpeg - - cartwheel - type: type: choice required: true @@ -46,12 +29,6 @@ on: workflow_call: inputs: - env: - type: string - required: true - source: - type: string - required: true type: type: string required: true @@ -69,56 +46,74 @@ env: cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }} variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }} msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }} - + system: windows-2022 + libvpl_refId: '' + libogg_refId: v1.3.5 + libvorbis_refId: v1.3.7 + libsvtav1_refId: v1.1.0 + libsnappy_refId: 1.1.9 + libvpx_refId: v1.12.0 + libmp3lame_refId: '' + libzimg_refId: '' + libopus_refId: '' + libfdkaac_refId: '' + libx264_refId: '' + libx265_refId: '' + jobs: libvpl: - runs-on: ${{ inputs.env }} - if: ${{ inputs.source == 'cartwheel' }} + runs-on: ${{ env.system }} + if: ${{ env.libvpl_refId != '' }} steps: - uses: actions/checkout@v3 - uses: ./.github/actions/libvpl with: - env: ${{ inputs.env }} + refId: ${{ env.libvpl_refId }} config: ${{ inputs.config }} liboggvorbis: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} + if: ${{ env.libogg_refId != '' && env.libvorbis_refId != '' }} steps: - uses: actions/checkout@v3 - uses: ./.github/actions/liboggvorbis with: - env: ${{ inputs.env }} + libogg_refId: ${{ env.libogg_refId }} + libvorbis_refId: ${{ env.libvorbis_refId }} config: ${{ inputs.config }} libsvtav1: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} + if: ${{ env.libsvtav1_refId != '' }} steps: - uses: actions/checkout@v3 - uses: ./.github/actions/libsvtav1 with: - env: ${{ inputs.env }} + refId: ${{ env.libsvtav1_refId }} config: ${{ inputs.config }} libsnappy: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} + if: ${{ env.libsnappy_refId != '' }} steps: - uses: actions/checkout@v3 - uses: ./.github/actions/libsnappy with: - env: ${{ inputs.env }} + refId: ${{ env.libsnappy_refId }} config: ${{ inputs.config }} libvpx: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} + if: ${{ env.libvpx_refId != '' }} steps: - uses: actions/checkout@v3 - uses: ./.github/actions/libvpx with: - env: ${{ inputs.env }} + refId: ${{ env.libvpx_refId }} config: ${{ inputs.config }} libmp3lame: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} steps: - uses: actions/checkout@v3 - uses: ./.github/actions/libmp3lame @@ -127,7 +122,7 @@ jobs: config: ${{ inputs.config }} libzimg: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} steps: - uses: actions/checkout@v3 - uses: ./.github/actions/libzimg @@ -136,7 +131,7 @@ jobs: config: ${{ inputs.config }} libopus: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} steps: - uses: actions/checkout@v3 - uses: ./.github/actions/libopus @@ -145,7 +140,7 @@ jobs: config: ${{ inputs.config }} libfdkaac: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} steps: - uses: actions/checkout@v3 - uses: ./.github/actions/libfdkaac @@ -154,7 +149,7 @@ jobs: config: ${{ inputs.config }} libx264: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} steps: - uses: actions/checkout@v3 - uses: ./.github/actions/libx264 @@ -163,7 +158,7 @@ jobs: config: ${{ inputs.config }} libx265-12: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} steps: - uses: actions/checkout@v3 - uses: ./.github/actions/libx265-12 @@ -172,7 +167,7 @@ jobs: config: ${{ inputs.config }} libx265-10: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} steps: - uses: actions/checkout@v3 - uses: ./.github/actions/libx265-10 @@ -181,7 +176,7 @@ jobs: config: ${{ inputs.config }} libx265: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} needs: [libx265-12,libx265-10] steps: - uses: actions/checkout@v3 @@ -191,7 +186,7 @@ jobs: config: ${{ inputs.config }} cartwheel: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} if: ${{ inputs.source == 'cartwheel' }} needs: [libvpl,libopus,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx] steps: @@ -239,7 +234,7 @@ jobs: path: dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz ffmpeg: - runs-on: ${{ inputs.env }} + runs-on: ${{ env.system }} if: ${{ inputs.source == 'ffmpeg' }} needs: [libopus,libsvtav1,libsnappy,libmp3lame,libzimg,liboggvorbis,libx264,libx265,libfdkaac,libvpx] steps: