Static libav failed on macOS, try dynamic?

This commit is contained in:
CDrummond 2025-03-04 13:25:45 +00:00
parent 0249bf8edb
commit b275568000
2 changed files with 61 additions and 11 deletions

View File

@ -57,7 +57,7 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: bliss-analyser-linux-x86
name: bliss-analyser-linux-x86-static
path: releases/
@ -149,7 +149,7 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: bliss-analyser-linux-arm
name: bliss-analyser-linux-arm-static
path: releases/
@ -227,7 +227,55 @@ jobs:
path: releases/
macOS_staticlibav:
# macOS_staticlibav:
# runs-on: macos-13
#
# steps:
# - name: Install Rust
# uses: actions-rs/toolchain@v1
# with:
# toolchain: stable
#
# - name: Checkout
# uses: actions/checkout@v2
#
# - name: Install deps
# run: |
# brew install pkg-config ffmpeg nasm
#
# - name: Install Rust support for ARM64 & prepare environment
# run: |
# rustup target add aarch64-apple-darwin
# mkdir releases
#
# - name: Build
# run: |
# cargo build --release --features update-aubio-bindings,staticlibav
# strip target/release/bliss-analyser
# cp target/release/bliss-analyser releases/bliss-analyser-x86_64
# cargo build --target=aarch64-apple-darwin --release --features update-aubio-bindings,staticlibav
# strip target/aarch64-apple-darwin/release/bliss-analyser
# cp target/aarch64-apple-darwin/release/bliss-analyser releases/bliss-analyser-arm64
#
# - name: Build fat binary
# run: |
# lipo -create \
# -arch x86_64 releases/bliss-analyser-x86_64 \
# -arch arm64 releases/bliss-analyser-arm64 \
# -output releases/bliss-analyser
#
# - name: Remove ununsed binaries
# run:
# rm releases/bliss-analyser-x86_64 releases/bliss-analyser-arm64
#
# - name: Upload artifacts
# uses: actions/upload-artifact@v4
# with:
# name: bliss-analyser-mac-static
# path: releases/
macOS_libav:
runs-on: macos-13
steps:
@ -241,7 +289,7 @@ jobs:
- name: Install deps
run: |
brew install pkg-config ffmpeg nasm
brew install pkg-config ffmpeg
- name: Install Rust support for ARM64 & prepare environment
run: |
@ -250,10 +298,10 @@ jobs:
- name: Build
run: |
cargo build --release --features update-aubio-bindings,staticlibav
cargo build --release --features update-aubio-bindings,libav
strip target/release/bliss-analyser
cp target/release/bliss-analyser releases/bliss-analyser-x86_64
cargo build --target=aarch64-apple-darwin --release --features update-aubio-bindings,staticlibav
cargo build --target=aarch64-apple-darwin --release --features update-aubio-bindings,libav
strip target/aarch64-apple-darwin/release/bliss-analyser
cp target/aarch64-apple-darwin/release/bliss-analyser releases/bliss-analyser-arm64
@ -271,7 +319,7 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: bliss-analyser-mac-ffmpeg
name: bliss-analyser-mac-libav
path: releases/

View File

@ -11,10 +11,12 @@ import datetime, os, requests, shutil, subprocess, sys, tempfile, time
GITHUB_TOKEN_FILE = "%s/.config/github-token" % os.path.expanduser('~')
GITHUB_REPO = "CDrummond/bliss-analyser"
LINUX_ARM_ARTIFACTS = ["bliss-analyser-linux-arm-ffmpeg", "bliss-analyser-debian-bullseye-arm-libav", "bliss-analyser-debian-bookworm-arm-libav"]
LINUX_X86_ARTIFACTS = ["bliss-analyser-linux-x86-ffmpeg", "bliss-analyser-ubuntu-22.04-x86-libav", "bliss-analyser-ubuntu-24.04-x86-libav"]
UNIX_ARTIFACTS = LINUX_ARM_ARTIFACTS + LINUX_X86_ARTIFACTS + ["bliss-analyser-mac-ffmpeg"]
GITHUB_ARTIFACTS = UNIX_ARTIFACTS + ["bliss-analyser-windows-libav"]
LINUX_ARM_ARTIFACTS = ["bliss-analyser-linux-arm-ffmpeg", "bliss-analyser-linux-arm-static", "bliss-analyser-debian-bullseye-arm-libav", "bliss-analyser-debian-bookworm-arm-libav"]
LINUX_X86_ARTIFACTS = ["bliss-analyser-linux-x86-ffmpeg", "bliss-analyser-linux-x86-static", "bliss-analyser-ubuntu-22.04-x86-libav", "bliss-analyser-ubuntu-24.04-x86-libav"]
MAC_ARTIFACTS = ["bliss-analyser-mac-ffmpeg", "bliss-analyser-mac-libav"]
WINDOWS_ARTIFACTS = ["bliss-analyser-windows-libav"]
UNIX_ARTIFACTS = LINUX_ARM_ARTIFACTS + LINUX_X86_ARTIFACTS + MAC_ARTIFACTS
GITHUB_ARTIFACTS = UNIX_ARTIFACTS + WINDOWS_ARTIFACTS
def info(s):