ci/win32: add arm64 build

kasper93 · Aug 24, 2024 · 641eb24 · 641eb24
1 parent 64a0e31
commit 641eb24
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -127,6 +127,11 @@ jobs:
       CCACHE_BASEDIR: ${{ github.workspace }}
       CCACHE_DIR: "${{ github.workspace }}\\.ccache"
       CCACHE_MAXSIZE: 500M
+    strategy:
+      matrix:
+        arch:
+          - "amd64"
+          - "arm64"
     steps:
       - name: Disable autocrlf
         run: |
@@ -171,7 +176,12 @@ jobs:
           $env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' -and `
                                                              $_ -ne 'C:\Strawberry\c\bin' }) -join ';'
           Import-Module "$env:VS\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
+<<<<<<< HEAD
           Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64"
+=======
+          Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=${{ matrix.arch }} -host_arch=amd64"
+<<<<<<< HEAD
+>>>>>>> e240996a29 (ci/win32: add arm64 build)
           ./ci/build-win32.ps1
 
       - name: Print build log
@@ -185,7 +195,7 @@ jobs:
           $env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' -and `
                                                              $_ -ne 'C:\Strawberry\c\bin' }) -join ';'
           Import-Module "$env:VS\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
-          Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64"
+          Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=${{ matrix.arch }} -host_arch=amd64"
           meson test -C build mpv:
 
       - name: Print meson test log
@@ -195,7 +205,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: mpv-x86_64-windows-msvc
+          name: mpv-${{ matrix.arch }}-windows-msvc
           path: |
             build/mpv.???
             build/vulkan-*.dll
@@ -206,7 +216,7 @@ jobs:
         if: always()
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: x86_64-windows-msvc-${{ steps.get_time.outputs.timestamp }}
+          key: ${{ matrix.arch }}-windows-msvc-${{ steps.get_time.outputs.timestamp }}
 
   macos:
     runs-on: ${{ matrix.os }}