Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

debug: Debug failing arm mac builds #7

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 0 additions & 61 deletions build-matrix.json
Original file line number Diff line number Diff line change
@@ -1,77 +1,16 @@
{
"comment1": "runners hosted by GitHub, always enabled",
"hosted": [
{
"comment": "Alpine container for static Linux binaries",
"os": "ubuntu-latest",
"container": "alpine:3.20",
"os_name": "linux",
"target_arch": "x64",
"exe_ext": ""
},
{
"comment": "Ubuntu 24.04 with hardware acceleration",
"os": "ubuntu-latest",
"container": "ubuntu:24.04",
"os_name": "linux",
"target_arch": "x64",
"exe_ext": "-ubuntu-24.04"
},
{
"comment": "Ubuntu 22.04 with hardware acceleration",
"os": "ubuntu-latest",
"container": "ubuntu:22.04",
"os_name": "linux",
"target_arch": "x64",
"exe_ext": "-ubuntu-22.04"
},
{
"comment": "Explicit macOS version 13 is required for explicit x64 CPU.",
"os": "macos-13",
"os_name": "osx",
"target_arch": "x64",
"exe_ext": ""
},
{
"comment": "Latest macOS version is arm64 CPU.",
"os": "macos-latest",
"os_name": "osx",
"target_arch": "arm64",
"exe_ext": ""
},
{
"os": "windows-latest",
"os_name": "win",
"target_arch": "x64",
"exe_ext": ".exe"
}
],

"comment2": "runners hosted by the owner, enabled by the ENABLE_SELF_HOSTED variable being set on the repo",
"selfHosted": [
{
"comment": "Alpine container for static Linux binaries",
"os": "self-hosted-linux-arm64",
"container": "alpine:3.20",
"os_name": "linux",
"target_arch": "arm64",
"exe_ext": ""
},
{
"comment": "Ubuntu 24.04 with hardware acceleration",
"os": "self-hosted-linux-arm64",
"container": "ubuntu:24.04",
"os_name": "linux",
"target_arch": "arm64",
"exe_ext": "-ubuntu-24.04"
},
{
"comment": "Ubuntu 22.04 with hardware acceleration",
"os": "self-hosted-linux-arm64",
"container": "ubuntu:22.04",
"os_name": "linux",
"target_arch": "arm64",
"exe_ext": "-ubuntu-22.04"
}
]
}
4 changes: 4 additions & 0 deletions build-scripts/90-ffmpeg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ elif [[ "$RUNNER_OS" == "macOS" ]]; then
# else to resolve this, and from my searches, it appears that others are not
# having this problem with ffmpeg. This is still a problem with n7.1
PLATFORM_CONFIGURE_FLAGS="$PLATFORM_CONFIGURE_FLAGS --disable-x86asm --disable-inline-asm"

# Enable position independent code (PIC). This resolved a crash on arm64.
PLATFORM_CONFIGURE_FLAGS="$PLATFORM_CONFIGURE_FLAGS --enable-pic"
elif [[ "$RUNNER_OS" == "Windows" ]]; then
# /usr/local/incude and /usr/local/lib are not in mingw's include
# and linker paths by default, so add them.
Expand Down Expand Up @@ -84,6 +87,7 @@ if ! ./configure \
--enable-gpl \
--enable-version3 \
--enable-static \
--enable-debug \
$PLATFORM_CONFIGURE_FLAGS; then
cat ffbuild/config.log
exit 1
Expand Down
5 changes: 5 additions & 0 deletions build-scripts/99-check-static.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ elif [[ "$RUNNER_OS" == "Windows" ]]; then
echo "$ffmpeg_deps" | grep -qvi /c/Windows/ && exit 1
echo "$ffprobe_deps" | grep -qvi /c/Windows/ && exit 1
elif [[ "$RUNNER_OS" == "macOS" ]]; then
curl https://storage.googleapis.com/shaka-streamer-assets/test-assets/BigBuckBunny.1080p.mp4 > in.mp4
./ffmpeg -y -i in.mp4 -loglevel trace -an -c:v libvpx-vp9 -f mp4 out.mp4
echo OK
exit 1

# These will still be dynamic executables.
# Capture the full list of dynamic library dependencies.
# With set -x, this also gets logged.
Expand Down
Loading