From 82d140e7d3fdd24b08fa844c8a8685e41a3f1ae6 Mon Sep 17 00:00:00 2001 From: Daniel Stankewitz Date: Tue, 27 Sep 2022 08:38:23 +0200 Subject: [PATCH] Update action.yml --- .github/actions/libmfx/action.yml | 62 ++++++++++++++----------------- 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/.github/actions/libmfx/action.yml b/.github/actions/libmfx/action.yml index 94ec860..3014cf1 100644 --- a/.github/actions/libmfx/action.yml +++ b/.github/actions/libmfx/action.yml @@ -11,39 +11,33 @@ inputs: runs: using: "composite" steps: - - name: pop + - name: Set up GIT shell: cmd run: | - md build build\pkgconfig dist - tar -czvf dist\libmfx.tgz .github\actions\libmfx\include .github\actions\libmfx\lib - dir /s -# - name: Set up GIT -# shell: cmd -# run: | -# git config --global core.autocrlf false -# git config --global core.eol lf -# - name: Checkout libmfx -# uses: actions/checkout@v3 -# with: -# repository: lu-zero/mfx_dispatch -# ref: ${{ inputs.refId }} -# path: libmfx -# - name: Set up MSYS2 -# uses: msys2/setup-msys2@v2 -# with: -# install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm -# path-type: inherit -# - name: Build libmfx -# shell: cmd -# env: -# vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\ -# cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }} -# run: | -# call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat" -# md build build\include build\lib build\lib\pkgconfig dist -# D:\a\_temp\setup-msys2\msys2.cmd -c 'cd libmfx ; autoreconf -i ; CC=cl CXX=cl CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) ; make -j $(nproc) ; make install ; cd ../build ; tar czf ../dist/libmfx.tgz *' -# - name: Publish artifact -# uses: actions/upload-artifact@v2 -# with: -# name: libmfx-${{ runner.os }}-${{ inputs.config }} -# path: dist/libmfx.tgz + git config --global core.autocrlf false + git config --global core.eol lf + - name: Checkout libmfx + uses: actions/checkout@v3 + with: + repository: lu-zero/mfx_dispatch + ref: ${{ inputs.refId }} + path: libmfx + - name: Set up MSYS2 + uses: msys2/setup-msys2@v2 + with: + install: base-devel binutils autotools automake mingw-w64-x86_64-cmake nasm + path-type: inherit + - name: Build libmfx + shell: cmd + env: + vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\ + cFlags: ${{ inputs.config == 'release' && '-MD' || '-MDd' }} + run: | + call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat" + md build build\include build\lib build\lib\pkgconfig dist + D:\a\_temp\setup-msys2\msys2.cmd -c 'cd libmfx ; autoreconf -i ; CC=cl CXX=cl CXXFLAGS=${{ env.cFlags }} ./configure --prefix=$(realpath ../build) ; make -j $(nproc) ; make install ; cd ../build ; tar czf ../dist/libmfx.tgz *' + - name: Publish artifact + uses: actions/upload-artifact@v2 + with: + name: libmfx-${{ runner.os }}-${{ inputs.config }} + path: dist/libmfx.tgz