merge windows

kvnp · May 19, 2024 · 240a955 · 240a955
1 parent f226655
commit 240a955
Showing 1 changed file with 5 additions and 24 deletions.
diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml
@@ -55,14 +55,17 @@ jobs:
           path: macOS-universal
 
   build-win:
-    name: Build Windows
+    name: Build Windows (${{ matrix.arch }})
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
         arch:
-          - x86
           - x64
+          - x86
+          - arm64
+    container:
+      image: mstorsjo/llvm-mingw:latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -83,27 +86,6 @@ jobs:
           name: win-${{ matrix.arch }}
           path: win-${{ matrix.arch }}
 
-  # The win-arm64 build runs in a special MinGW container to cross-compile successfully.
-  build-win-arm64:
-    name: Build Windows (arm64)
-    runs-on: ubuntu-22.04
-    container:
-      image: mstorsjo/llvm-mingw:latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Build
-        run: osu.Framework.NativeLibs/scripts/ffmpeg/build-win.sh
-        env:
-          arch: arm64
-
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: win-arm64
-          path: win-arm64
-
   build-linux:
     name: Build Linux (${{ matrix.arch }})
     # Use 20.04 to target glibc 2.31 like the other native libs
@@ -145,7 +127,6 @@ jobs:
     needs:
       - combine-macos
       - build-win
-      - build-win-arm64
       - build-linux
     strategy:
       matrix: