From 6faba3f478a791796d9955705d8a90cfff83b99d Mon Sep 17 00:00:00 2001 From: odrling Date: Tue, 26 Mar 2024 02:20:24 +0100 Subject: [PATCH] ci: use chimera:cross image --- Containerfile | 4 +--- ci/build.sh | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Containerfile b/Containerfile index b119748..9a91dd1 100644 --- a/Containerfile +++ b/Containerfile @@ -1,8 +1,6 @@ -FROM ghcr.io/odrling/chimera:x86_64 AS builder +FROM ghcr.io/odrling/chimera:cross AS builder ARG ARCH -RUN apk upgrade && apk add musl-devel meson clang git lld - COPY . /ffmpegaacsucks RUN cd /ffmpegaacsucks && ARCH=$ARCH ci/build.sh diff --git a/ci/build.sh b/ci/build.sh index 78d87fb..8d2e578 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -2,7 +2,6 @@ export LDFLAGS="-Wl,-Bsymbolic" if [ "$ARCH" != x86_64 ]; then - apk add "base-cross-$ARCH" "clang-rt-cross-$ARCH" "clang-rt-crt-cross-$ARCH" extra_args="--cross-file ci/$ARCH-chimera-linux-musl.txt" fi