Update ffmpeg.yml

This commit is contained in:
Daniel Stankewitz 2022-07-07 11:05:47 +02:00 committed by GitHub
parent dd9b7f02f5
commit 911b943b8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -101,39 +101,44 @@ on:
env: env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\ 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 --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 NASM_EXECUTABLE: nasm
cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }} cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }}
variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }} variant: ${{ inputs.type == 'static' && ' --pkg-config-flags="--static" --disable-shared --enable-static' || ' --disable-static --enable-shared' }}
jobs: jobs:
libvpl: libvpl:
env:
cartwheel: ${{ inputs.source == 'cartwheel' }}
runs-on: ${{ inputs.env }} runs-on: ${{ inputs.env }}
steps: steps:
- name: Set up GIT - name: Set up GIT
if: ${{ env.cartwheel }}
run: | run: |
git config --global core.autocrlf false git config --global core.autocrlf false
git config --global core.eol lf git config --global core.eol lf
- name: Checkout oneVPL - name: Checkout oneVPL
if: ${{ env.cartwheel }}
uses: actions/checkout@v3.0.0 uses: actions/checkout@v3.0.0
with: with:
repository: oneapi-src/oneVPL repository: oneapi-src/oneVPL
ref: master ref: master
path: onevpl path: onevpl
- name: Check cache - name: Check cache
if: ${{ env.cartwheel }}
id: libvpl-cache id: libvpl-cache
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: dist path: dist
key: libvpl-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('onevpl') }} key: libvpl-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('onevpl') }}
- name: Set up MSYS2 - 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 uses: msys2/setup-msys2@v2
with: with:
install: base-devel binutils autotools automake install: base-devel binutils autotools automake
path-type: inherit path-type: inherit
- name: Build oneVPL - name: Build oneVPL
if: steps.libvpl-cache.outputs.cache-hit != 'true' if: env.cartwheel && steps.libvpl-cache.outputs.cache-hit != 'true'
shell: cmd shell: cmd
run: | run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat" 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" 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 *' D:\a\_temp\setup-msys2\msys2.cmd -c 'rm -rf bin/cmake ; tar czf ../dist/libvpl.tgz *'
- name: Publish artifact - name: Publish artifact
if: ${{ env.cartwheel }}
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: libvpl name: libvpl
path: dist/libvpl.tgz path: dist/libvpl.tgz
- name: Set the value
id: step_one
run: |
echo "switches=${{ env.switches }} --enable-libvpl' " >> $GITHUB_ENV
ffmpeg: ffmpeg:
runs-on: windows-2022 runs-on: windows-2022