voukoder/voukoder-ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Update test.yml

Browse Source
This commit is contained in:
Daniel Stankewitz 2022-09-26 09:32:54 +02:00 committed by GitHub
parent a15bfc298b
commit 0e1b67f310
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/test.yml vendored
View File

@ -32,7 +32,7 @@ on:
ffmpegRef: ffmpegRef:
type: string type: string
required: true required: true
default: 'release/5.1' default: 'master'
description: 'FFmpeg refId' description: 'FFmpeg refId'
workflow_call: workflow_call:
@ -52,25 +52,25 @@ on:
env: env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\ vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
COMPONENTS: "--enable-libmfx " COMPONENTS: "--enable-libvpl "
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' }}
msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }} msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
jobs: jobs:
libmfx: libvpl:
runs-on: ${{ inputs.system }} runs-on: ${{ inputs.system }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: ./.github/actions/libmfx - uses: ./.github/actions/libvpl
with: with:
refId: master refId: master
config: ${{ inputs.config }} config: ${{ inputs.config }}
ffmpeg: ffmpeg:
runs-on: ${{ inputs.system }} runs-on: ${{ inputs.system }}
needs: [libmfx] needs: [libvpl]
steps: steps:
- name: Set up MSYS2 - name: Set up MSYS2
uses: msys2/setup-msys2@v2 uses: msys2/setup-msys2@v2
@ -112,7 +112,7 @@ jobs:
run: | run: |
call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat" call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
md build dist 0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch md build dist 0001-dynamic-loading-of-shared-fdk-aac-library-cw-5.0.patch
D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace --verbose ../libfdkaac-dynlib-5.1.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --extra-libs=libmfx.lib --extra-libs=uuid.lib --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz * ; cat ../ffmpeg/ffbuild/config.log' D:\a\_temp\setup-msys2\msys2.cmd -c 'cd ffmpeg ; git apply --ignore-whitespace --verbose ../libfdkaac-dynlib-5.1.patch ; sed -i "s/#define X264_API_IMPORTS 1/\/\/#define X264_API_IMPORTS 1/g" libavcodec/libx264.c ; cd ../build ; for file in `ls ../build_artifacts/**/*.tgz`; do tar -xzf $file; done ; rm -f bin/*.dll ; cd ../nvenc ; make PREFIX=../build install ; cp -a ../amf/amf/public/include ../build/include/AMF ; cd ../ffmpeg ; PKG_CONFIG_PATH=../build/lib/pkgconfig ./configure --toolchain=msvc --extra-cflags="${{ env.cFlags }} -I../build/include" --extra-ldflags="-LIBPATH:../build/lib" --prefix=../build --extra-libs=Ole32.lib --extra-libs=Advapi32.lib --disable-doc ${{ env.variant }} --enable-runtime-cpudetect --enable-w32threads --enable-gpl ${{ env.COMPONENTS }} ; make -j 2 ; make install ; cd ../build/lib ; for file in *.a; do mv "$file" "`basename "$file" .a`.lib" ; done ; rm -rf fdk-aac.lib cmake pkgconfig *.la ../share ; cd .. ; tar czf ../dist/ffmpeg-win64-${{ inputs.type }}-${{ inputs.config }}.tar.gz * ; cat ../ffmpeg/ffbuild/config.log'
- name: Publish FFmpeg artifacts - name: Publish FFmpeg artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with: