From 287a563a0dc00844a5437907e0562050cc072085 Mon Sep 17 00:00:00 2001
From: Daniel Stankewitz <daniel.stankewitz@gmail.com>
Date: Thu, 14 Jul 2022 08:50:43 +0200
Subject: [PATCH] composition

---
 .github/workflows/ffmpeg.yml | 11 +++--
 .github/workflows/libvpl.yml | 85 ++++++++++++++++++------------------
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml
index f6e0438..68c9b80 100644
--- a/.github/workflows/ffmpeg.yml
+++ b/.github/workflows/ffmpeg.yml
@@ -110,10 +110,13 @@ env:
   
 jobs:
   libvpl:
-    uses: ./.github/workflows/libvpl.yml
-    with:
-      env: ${{ inputs.env }}
-      config: ${{ inputs.config }}
+    runs-on: ${{ inputs.env }}
+    steps:
+    - id: libvpl
+      uses: ./.github/workflows/libvpl.yml
+      with:
+        env: ${{ inputs.env }}
+        config: ${{ inputs.config }}
 
   liboggvorbis:
     uses: ./.github/workflows/liboggvorbis.yml
diff --git a/.github/workflows/libvpl.yml b/.github/workflows/libvpl.yml
index d48edde..2706402 100644
--- a/.github/workflows/libvpl.yml
+++ b/.github/workflows/libvpl.yml
@@ -19,46 +19,45 @@ env:
   vsPath: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
   msbuildConfig: ${{ inputs.config == 'release' && 'Release' || 'Debug' }}
 
-jobs:
-  libvpl:
-    runs-on: ${{ inputs.env }}
-    steps:
-    - name: Set up GIT
-      run: |
-        git config --global core.autocrlf false
-        git config --global core.eol lf
-    - name: Checkout oneVPL
-      uses: actions/checkout@v3.0.0
-      with:
-        repository: oneapi-src/oneVPL
-        ref: master
-        path: onevpl
-    - name: Check cache
-      id: libvpl-cache
-      uses: actions/cache@v3
-      with:
-        path: dist
-        key: libvpl-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('onevpl') }}
-    - name: Set up MSYS2
-      if: steps.libvpl-cache.outputs.cache-hit != 'true'
-      uses: msys2/setup-msys2@v2
-      with:
-        install: base-devel binutils autotools automake
-        path-type: inherit
-    - name: Build oneVPL
-      if: steps.libvpl-cache.outputs.cache-hit != 'true'
-      shell: cmd
-      run: |
-        call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
-        md temp build dist
-        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
-        MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{ env.msbuildConfig }} -m vpl.sln
-        cd ..\build
-        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 *'
-    - name: Publish artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: libvpl-${{ inputs.env }}-${{ inputs.config }}
-        path: dist/libvpl.tgz
\ No newline at end of file
+runs:
+  using: "composite"
+  steps:
+  - name: Set up GIT
+    run: |
+      git config --global core.autocrlf false
+      git config --global core.eol lf
+  - name: Checkout oneVPL
+    uses: actions/checkout@v3.0.0
+    with:
+      repository: oneapi-src/oneVPL
+      ref: master
+      path: onevpl
+  - name: Check cache
+    id: libvpl-cache
+    uses: actions/cache@v3
+    with:
+      path: dist
+      key: libvpl-${{ inputs.env }}-${{ inputs.config }}-${{ hashFiles('onevpl') }}
+  - name: Set up MSYS2
+    if: steps.libvpl-cache.outputs.cache-hit != 'true'
+    uses: msys2/setup-msys2@v2
+    with:
+      install: base-devel binutils autotools automake
+      path-type: inherit
+  - name: Build oneVPL
+    if: steps.libvpl-cache.outputs.cache-hit != 'true'
+    shell: cmd
+    run: |
+      call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat"
+      md temp build dist
+      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
+      MSBuild.exe -t:VPL,INSTALL -p:Configuration=${{ env.msbuildConfig }} -m vpl.sln
+      cd ..\build
+      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 *'
+  - name: Publish artifact
+    uses: actions/upload-artifact@v2
+    with:
+      name: libvpl-${{ inputs.env }}-${{ inputs.config }}
+      path: dist/libvpl.tgz
\ No newline at end of file