Update build.yml (#15)

Refactor build.yml to use opus lib workflow opus_lib_x64.yml
ashipo · Apr 17, 2024 · 985c46f · 985c46f
1 parent bc30d45
commit 985c46f
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,37 +11,43 @@ env:
   BINARY_FILE_PATH: bin
   BUILD_CONFIGURATION: Release
   PLATFORM: x64
-  OPUS_CACHE_PATH: opus-lib/1.4/x64
-  OPUS_CACHE_KEY: opus-lib-1.4-x64
+  OPUS_VERSION: v1.5.2
 
 permissions:
   contents: read
 
 jobs:
   build-opus:
-    uses: ./.github/workflows/opus_1.4_x64.yml
+    uses: ./.github/workflows/opus_lib_x64.yml
+    with:
+      opus-version: v1.5.2
 
   build:
     needs: build-opus
     runs-on: windows-latest
 
     steps:
+    - name: Init environment files
+      run: |
+        echo "OPUS_CACHE_KEY=opus-lib-${{ env.OPUS_VERSION }}-x64" >> $env:GITHUB_ENV
+        echo "OPUS_CACHE_PATH=opus-lib/${{ env.OPUS_VERSION }}/x64" >> $env:GITHUB_ENV
+
     - name: Checkout
       uses: actions/checkout@v4
 
     - name: Cache restore opus
       uses: actions/cache/restore@v4
       with:
-        key: ${{env.OPUS_CACHE_KEY}}
-        path: ${{env.OPUS_CACHE_PATH}}
+        key: ${{ env.OPUS_CACHE_KEY }}
+        path: ${{ env.OPUS_CACHE_PATH }}
 
     - name: Move opus lib file
       run: |
         mkdir -p lib/opus/${{env.PLATFORM}}
-        mv ${{env.OPUS_CACHE_PATH}}/opus.lib lib/opus/${{env.PLATFORM}}
+        mv ${{ env.OPUS_CACHE_PATH }}/opus.lib lib/opus/${{ env.PLATFORM }}
 
     - name: Install boost
-      uses: MarkusJx/install-boost@v2.4.4
+      uses: MarkusJx/install-boost@v2.4.5
       id: install-boost
       with:
         boost_version: 1.83.0
@@ -52,16 +58,16 @@ jobs:
       uses: microsoft/setup-msbuild@v2
 
     - name: Restore NuGet packages
-      working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: nuget restore ${{env.SOLUTION_FILE_PATH}}
+      working-directory: ${{ env.GITHUB_WORKSPACE }}
+      run: nuget restore ${{ env.SOLUTION_FILE_PATH }}
 
     - name: Build
-      working-directory: ${{env.GITHUB_WORKSPACE}}
+      working-directory: ${{ env.GITHUB_WORKSPACE }}
       env:
         BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}\include
       run: |
-        msbuild ${{env.SOLUTION_FILE_PATH}} -m -p:Configuration=${{env.BUILD_CONFIGURATION}} -p:Platform=${{env.PLATFORM}} -p:OutDir="${{github.workspace}}\${{env.BINARY_FILE_PATH}}\"
+        msbuild ${{ env.SOLUTION_FILE_PATH }} -m -p:Configuration=${{ env.BUILD_CONFIGURATION }} -p:Platform=${{ env.PLATFORM }} -p:OutDir="${{ github.workspace }}\${{ env.BINARY_FILE_PATH }}\"
 
     - name: Run tests
       run: |
-        & "${{env.BINARY_FILE_PATH}}\Tests.exe"
+        & "${{ env.BINARY_FILE_PATH }}\Tests.exe"