Fix build for arm

Added manual rebuild

Author: System233

.github/workflows/build.yml

@@ -1,12 +1,19 @@
+env:
+  MSYS2_PATH_TYPE: inherit
+  SDK_VER: 10.0.22621.0
+  TAG_NAME: ${{ inputs.tag_name||github.ref_name }}
+
 name: Build
-run-name: Build ${{github.ref_name}}
+run-name: Build ${{inputs.tag_name||github.ref_name}}
 
 on:
   push:
     tags: "*"
-
-env:
-  MSYS2_PATH_TYPE: inherit
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: "Tag"
+        required: true
 jobs:
   build:
     strategy:
@@ -15,25 +22,20 @@ jobs:
         type: [static, shared]
         license: [gpl, lgpl]
       fail-fast: false
-    runs-on: windows-latest
+    runs-on: windows-2022
     env:
       # amd64_arm,amd64_arm64,x86,amd64
-      name: ffmpeg-${{ github.ref_name }}-${{matrix.license}}-${{matrix.arch}}-${{matrix.type}}
+      name: ffmpeg-${{ inputs.tag_name||github.ref_name }}-${{matrix.license}}-${{matrix.arch}}-${{matrix.type}}
       target: ${{contains(matrix.arch,'arm')&&format('amd64_{0}',matrix.arch)||matrix.arch}}
     steps:
       - name: Find MSVC
         shell: bash
         id: msvc
         run: |
           echo "installationPath=$(vswhere -all -legacy -property installationPath)">>$GITHUB_OUTPUT
-      #winget install mesonbuild.meson
-      # - name: Setup Mesonbuild
-      #   shell: cmd
-      #   run: |
-      #     python3 -m pip install meson
-      #     meson -v
       - uses: actions/checkout@v4
         with:
+          ref: ${{env.TAG_NAME}}
           submodules: recursive
       - uses: msys2/setup-msys2@v2
         with:
@@ -45,14 +47,23 @@ jobs:
             yasm
             nasm
 
+      - name: Rebase
+        if: ${{inputs.tag_name}}
+        shell: msys2 {0}
+        run: |
+          cd FFmpeg
+          git fetch --tags
+          git checkout ${{inputs.tag_name}}
+          git submodule update --init --recursive --depth 1
+
       - name: Remove MSYS2 link
         shell: msys2 {0}
         run: rm $(which link)
 
       - name: Build
         shell: cmd
         run: |
-          CALL "${{steps.msvc.outputs.installationPath}}\VC\Auxiliary\Build\vcvarsall.bat" ${{env.target}}
+          CALL "${{steps.msvc.outputs.installationPath}}\VC\Auxiliary\Build\vcvarsall.bat" ${{env.target}} ${{env.SDK_VER}}
           msys2 -c "./build.sh ${{matrix.arch}} ${{matrix.type}} ${{matrix.license}}"
       - name: Debug log
         if: ${{ failure() }}
@@ -72,11 +83,12 @@ jobs:
           sha1sum ${{env.name}}.zip ${{env.name}}.tar.gz >${{env.name}}.sha1
           ./build-changelog.sh > changelog
       - name: Release
-        if: startsWith(github.ref, 'refs/tags/')
+        if: ${{startsWith(github.ref, 'refs/tags/')||inputs.tag_name}}
         uses: softprops/action-gh-release@v2
         with:
+          tag_name: ${{env.TAG_NAME}}
           body_path: changelog
-          prerelease: ${{contains(github.ref_name,'dev')}}
+          prerelease: ${{contains(env.TAG_NAME,'dev')}}
           files: |
             ${{env.name}}.zip
             ${{env.name}}.tar.gz

README.md

@@ -1,4 +1,4 @@
-# FFmpeg Builder (with MSVC)
+# FFmpeg Builder
 
 [![Build FFmpeg](https://github.com/System233/ffmpeg-builds/actions/workflows/build.yml/badge.svg)](https://github.com/System233/ffmpeg-builds/actions/workflows/build.yml)
 
@@ -7,7 +7,7 @@ Build results: [Download](https://github.com/System233/ffmpeg-msvc-prebuilt/rele
 ## Build Info
 
 - Binaries: Now includes ffmpeg, ffplay and ffprobe executable files, as well as related header files and lib.
-- Arch support: x64, x86, ⚠arm and arm64 (since most runners in Github Action do not have Windows arm SDK, arm builds are not 100% successful).
+- Arch support: x64, x86, arm and arm64.
 - Linker: static, shared
 - License: GPLv3, LGPLv2.1