diff --git a/.github/actions/libx265/action.yml b/.github/actions/libx265/action.yml index dfa9ab2..c992a39 100644 --- a/.github/actions/libx265/action.yml +++ b/.github/actions/libx265/action.yml @@ -1,7 +1,7 @@ name: libx265 inputs: - env: + refId: type: string required: true config: @@ -17,31 +17,20 @@ runs: git config --global core.autocrlf false git config --global core.eol lf git clone -b Release_3.5 https://github.com/videolan/x265.git x265 - - name: Check cache - id: libx265-cache - uses: actions/cache@v3 - with: - path: di - key: libx265-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('x265') }} - name: Set up MSYS2 - if: steps.libx265-cache.outputs.cache-hit != 'true' uses: msys2/setup-msys2@v2 with: install: base-devel binutils autotools automake path-type: inherit - name: Set up MSBuild - if: steps.libx265-cache.outputs.cache-hit != 'true' uses: microsoft/setup-msbuild@v1.1 - name: Set up NASM - if: steps.libx265-cache.outputs.cache-hit != 'true' uses: ilammy/setup-nasm@v1.2.1 - name: Set up dependant libs - if: steps.libx265-cache.outputs.cache-hit != 'true' uses: actions/download-artifact@v3 with: path: build - name: Build X265 - if: steps.libx265-cache.outputs.cache-hit != 'true' shell: cmd env: vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\ @@ -59,11 +48,11 @@ runs: move ${{ inputs.config }}\x265-static.lib ..\..\..\..\build\ move x265_config.h ..\..\..\..\dist\include\ cd ..\..\..\.. - "${{ env.vsPath }}VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\lib.exe" /ignore:4006 /ignore:4221 /OUT:dist\lib\x265.lib build\x265-static.lib build\x265_10bit-${{ inputs.env }}-${{ inputs.config }}\x265_10bit.lib build\x265_12bit-${{ inputs.env }}-${{ inputs.config }}\x265_12bit.lib + "${{ env.vsPath }}VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\lib.exe" /ignore:4006 /ignore:4221 /OUT:dist\lib\x265.lib build\x265-static.lib build\x265_10bit-${{ runner.os }}-${{ inputs.config }}\x265_10bit.lib build\x265_12bit-${{ runner.os }}-${{ inputs.config }}\x265_12bit.lib copy x265\source\x265.h dist\include\ D:\a\_temp\setup-msys2\msys2.cmd -c 'cd dist ; tar czf ../di/libx265.tgz *' - name: Publish artifact uses: actions/upload-artifact@v2 with: - name: libx265-${{ inputs.env }}-${{ inputs.config }} - path: di/libx265.tgz \ No newline at end of file + name: libx265-${{ runner.os }}-${{ inputs.config }} + path: di/libx265.tgz