no emulation

Author: kasperk81

.github/workflows/ci.yml

@@ -59,9 +59,6 @@ jobs:
       - name: Build macOS
         if: runner.os == 'macOS'
         run: ./build.libgit2.sh
-      - name: Setup QEMU
-        if: startsWith(matrix.name, 'linux-musl-') || matrix.name == 'linux-riscv64'
-        run: docker run --privileged --rm tonistiigi/binfmt --install all
       - name: Build Linux
         if: runner.os == 'Linux'
         run: ./dockerbuild.sh

docker/linux

@@ -1,9 +1,36 @@
-FROM kmturley/crossbuild
-ARG ARCH='amd64'
-ENV CROSS_TRIPLE=${ARCH}
-RUN apt update && apt -y install pkg-config
+FROM ubuntu:24.04
+ARG ARCH=amd64
+ARG IS_MUSL=false
+
+# 1. Install common host utilities
+RUN apt-get update && apt-get install -y \
+    build-essential cmake git pkg-config wget xz-utils
+
+# 2. Setup GLIBC Cross-Compilers (if not musl)
+RUN if [ "$IS_MUSL" = "false" ]; then \
+        if [ "$ARCH" = "arm64" ]; then apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu && echo "CC=aarch64-linux-gnu-gcc\nCXX=aarch64-linux-gnu-g++" >> /env_vars; \
+        elif [ "$ARCH" = "armhf" ]; then apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf && echo "CC=arm-linux-gnueabihf-gcc\nCXX=arm-linux-gnueabihf-g++" >> /env_vars; \
+        elif [ "$ARCH" = "powerpc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu && echo "CC=powerpc64le-linux-gnu-gcc\nCXX=powerpc64le-linux-gnu-g++" >> /env_vars; \
+        elif [ "$ARCH" = "riscv64" ]; then apt-get install -y gcc-riscv64-linux-gnu g++-riscv64-linux-gnu && echo "CC=riscv64-linux-gnu-gcc\nCXX=riscv64-linux-gnu-g++" >> /env_vars; \
+        else echo "CC=gcc\nCXX=g++" >> /env_vars; fi \
+    fi
+
+# 3. Setup MUSL Cross-Compilers (if musl)
+RUN if [ "$IS_MUSL" = "true" ]; then \
+        if [ "$ARCH" = "arm64" ]; then TARGET_TRIPLE="aarch64-linux-musl"; \
+        elif [ "$ARCH" = "armhf" ]; then TARGET_TRIPLE="armhf-linux-musl"; \
+        elif [ "$ARCH" = "powerpc64le" ]; then TARGET_TRIPLE="powerpc64le-linux-musl"; \
+        elif [ "$ARCH" = "riscv64" ]; then TARGET_TRIPLE="riscv64-linux-musl"; \
+        else TARGET_TRIPLE="x86_64-linux-musl"; fi && \
+        wget -q https://musl.cc/${TARGET_TRIPLE}-cross.tgz && \
+        tar -xf ${TARGET_TRIPLE}-cross.tgz -C /opt && \
+        rm ${TARGET_TRIPLE}-cross.tgz && \
+        echo "PATH=/opt/${TARGET_TRIPLE}-cross/bin:\$PATH" >> /env_vars && \
+        echo "CC=${TARGET_TRIPLE}-gcc\nCXX=${TARGET_TRIPLE}-g++" >> /env_vars; \
+    fi
 
 WORKDIR /nativebinaries
 COPY . /nativebinaries/
 
-CMD ["/bin/bash", "-c", "./build.libgit2.sh"]
+# Inject environmental paths dynamically to run the libgit2 build script natively
+CMD ["/bin/bash", "-c", "export $(cat /env_vars | xargs) && ./build.libgit2.sh"]

docker/musl

@@ -3,8 +3,6 @@
 set -e
 echo "building for $RID"
 
-alpineVersion=3.13
-
 if [[ $RID =~ arm64 ]]; then
     arch="arm64"
 elif [[ $RID =~ arm ]]; then
@@ -13,20 +11,21 @@ elif [[ $RID =~ ppc64le ]]; then
     arch="powerpc64le"
 elif [[ $RID =~ riscv64 ]]; then
     arch="riscv64"
-    alpineVersion=3.20 # alpine 3.20 is the first version with official riscv64 support
 else
     arch="amd64"
 fi
 
 if [[ $RID == linux-musl* ]]; then
-    dockerfile="docker/musl"
+    is_musl="true"
 else
-    dockerfile="docker/linux"
+    is_musl="false"
 fi
 
-docker build --no-cache --platform linux/$arch -t $RID -f $dockerfile --build-arg ARCH=$arch --build-arg ALPINE_VERSION=$alpineVersion .
+docker build --no-cache -t $RID -f docker/linux \
+    --build-arg ARCH=$arch \
+    --build-arg IS_MUSL=$is_musl .
 
-docker run -t --platform linux/$arch -e RID=$RID --name=$RID $RID
+docker run -t -e RID=$RID --name=$RID $RID
 
 docker cp $RID:/nativebinaries/nuget.package/runtimes nuget.package