diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml index 55c8dea..97e52f6 100644 --- a/.github/workflows/ffmpeg.yml +++ b/.github/workflows/ffmpeg.yml @@ -101,39 +101,44 @@ on: env: vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\ #switches: "--enable-libvpl --enable-libsvtav1 --enable-libsnappy --enable-libmp3lame --enable-libzimg --enable-libopus --enable-libvorbis --enable-libx264 --enable-libx265 --enable-libfdk-aac --enable-libvpx " - switches: "--enable-libvpl" + switches: "" NASM_EXECUTABLE: nasm cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }} variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }} jobs: libvpl: + env: + cartwheel: ${{ inputs.source == 'cartwheel' }} runs-on: ${{ inputs.env }} steps: - name: Set up GIT + if: ${{ env.cartwheel }} run: | git config --global core.autocrlf false git config --global core.eol lf - name: Checkout oneVPL + if: ${{ env.cartwheel }} uses: actions/checkout@v3.0.0 with: repository: oneapi-src/oneVPL ref: master path: onevpl - name: Check cache + if: ${{ env.cartwheel }} id: libvpl-cache uses: actions/cache@v3 with: path: dist key: libvpl-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('onevpl') }} - name: Set up MSYS2 - if: steps.libvpl-cache.outputs.cache-hit != 'true' + if: env.cartwheel && steps.libvpl-cache.outputs.cache-hit != 'true' uses: msys2/setup-msys2@v2 with: install: base-devel binutils autotools automake path-type: inherit - name: Build oneVPL - if: steps.libvpl-cache.outputs.cache-hit != 'true' + if: env.cartwheel && steps.libvpl-cache.outputs.cache-hit != 'true' shell: cmd run: | call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat" @@ -145,10 +150,15 @@ jobs: IF EXIST "lib\vpld.lib" move "lib\vpld.lib" "lib\vpl.lib" D:\a\_temp\setup-msys2\msys2.cmd -c 'rm -rf bin/cmake ; tar czf ../dist/libvpl.tgz *' - name: Publish artifact + if: ${{ env.cartwheel }} uses: actions/upload-artifact@v2 with: name: libvpl path: dist/libvpl.tgz + - name: Set the value + id: step_one + run: | + echo "switches=${{ env.switches }} --enable-libvpl' " >> $GITHUB_ENV ffmpeg: runs-on: windows-2022