composition

This commit is contained in:
Daniel Stankewitz 2022-07-14 08:50:43 +02:00
parent f5a74179a5
commit 287a563a0d
2 changed files with 49 additions and 47 deletions

View File

@ -110,10 +110,13 @@ env:
jobs: jobs:
libvpl: libvpl:
uses: ./.github/workflows/libvpl.yml runs-on: ${{ inputs.env }}
with: steps:
env: ${{ inputs.env }} - id: libvpl
config: ${{ inputs.config }} uses: ./.github/workflows/libvpl.yml
with:
env: ${{ inputs.env }}
config: ${{ inputs.config }}
liboggvorbis: liboggvorbis:
uses: ./.github/workflows/liboggvorbis.yml uses: ./.github/workflows/liboggvorbis.yml

View File

@ -19,46 +19,45 @@ env:
vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\ vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }} msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
jobs: runs:
libvpl: using: "composite"
runs-on: ${{ inputs.env }} steps:
steps: - name: Set up GIT
- name: Set up GIT 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 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 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: 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: 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" md temp build dist
md temp build dist cd temp
cd temp cmake.exe -G "Visual Studio 17 2022" ..\onevpl -T host=x64 -A x64 -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=..\build -DCMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD=ON
cmake.exe -G "Visual Studio 17 2022" ..\onevpl -T host=x64 -A x64 -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=..\build -DCMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD=ON MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{ env.msbuildConfig }} -m vpl.sln
MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{ env.msbuildConfig }} -m vpl.sln cd ..\build
cd ..\build 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 uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v2 with:
with: name: libvpl-${{ inputs.env }}-${{ inputs.config }}
name: libvpl-${{ inputs.env }}-${{ inputs.config }} path: dist/libvpl.tgz
path: dist/libvpl.tgz