File tree 2 files changed +16
-6
lines changed
2 files changed +16
-6
lines changed Original file line number Diff line number Diff line change @@ -26,18 +26,25 @@ jobs:
26
26
- os : macos-13
27
27
arch : x86_64
28
28
shell : bash
29
+ - os : ubuntu-24.04-arm
30
+ arch : aarch64
31
+ shell : bash
29
32
- os : ubuntu-24.04
30
33
arch : i686
31
34
shell : bash
32
35
- os : ubuntu-24.04
33
36
arch : x86_64
34
37
shell : bash
38
+ - os : windows-11-arm
39
+ arch : ARM64
40
+ shell : ' msys2 {0}'
41
+ msys_prefix : mingw-w64-clang-aarch64
42
+ msys_system : CLANGARM64
35
43
- os : windows-latest
36
44
arch : AMD64
37
45
shell : ' msys2 {0}'
38
- - os : ubuntu-24.04-arm
39
- arch : aarch64
40
- shell : bash
46
+ msys_prefix : mingw-w64-x86_64
47
+ msys_system : MINGW64
41
48
defaults :
42
49
run :
43
50
shell : ${{ matrix.shell }}
@@ -55,10 +62,11 @@ jobs:
55
62
brew update
56
63
brew unlink gettext libidn2 libpng libtiff libunistring libx11 libxau libxcb libxdmcp little-cms2 unbound
57
64
- uses : msys2/setup-msys2@v2
58
- if : matrix.os == 'windows-latest'
65
+ if : matrix.os == 'windows-latest' || matrix.os == 'windows-11-arm'
59
66
with :
60
- install : base-devel mingw-w64-x86_64-gcc mingw-w64-x86_64- gperf mingw-w64-x86_64-nasm openssl-devel
67
+ install : base-devel openssl-devel ${{ matrix.msys_prefix }}-cc ${{ matrix.msys_prefix }}- gperf ${{ matrix.msys_prefix }}-nasm
61
68
path-type : inherit
69
+ msystem : ${{ matrix.msys_system }}
62
70
release : false
63
71
- name : Build FFmpeg
64
72
env :
Original file line number Diff line number Diff line change @@ -32,7 +32,9 @@ def get_platform() -> str:
32
32
elif system == "Darwin" :
33
33
return f"macosx_{ machine } "
34
34
elif system == "Windows" :
35
- if struct .calcsize ("P" ) * 8 == 64 :
35
+ if machine == "ARM64" :
36
+ return "win_arm64"
37
+ elif struct .calcsize ("P" ) * 8 == 64 :
36
38
return "win_amd64"
37
39
else :
38
40
return "win32"
You can’t perform that action at this time.
0 commit comments