Switch back to glibc for static builds

Signed-off-by: Vasyl Gello <[email protected]>
yggdrasil-network · Jul 24, 2024 · e47fb82 · e47fb82
1 parent 2c09a1d
commit e47fb82
Showing 1 changed file with 23 additions and 22 deletions.
diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml
@@ -28,19 +28,20 @@ jobs:
         with:
           go-version: "1.21"
 
-      - name: Download and install musl toolchain for Linux
+      - name: Download and install cross-tools
         run: |
-          sudo mkdir -p /opt/x-tools
-          pushd /tmp
-          curl -s "https://api.github.com/repos/musl-cross/musl-cross/releases/latest" |
-            jq -r '.assets[] | .browser_download_url' | while read -r LINK; do
-              TARBALL="$(basename "$LINK")"
-              curl -L -o "$TARBALL" "$LINK"
-              sudo tar -xf "$TARBALL" -C /opt/x-tools
-          done
-          popd
+          sudo apt-get update
+          sudo apt-get install \
+            crossbuild-essential-armhf \
+            crossbuild-essential-arm64 \
+            crossbuild-essential-mips \
+            crossbuild-essential-mipsel \
+            crossbuild-essential-mips64 \
+            crossbuild-essential-mips64el \
+            crossbuild-essential-riscv64 \
+            crossbuild-essential-s390x
 
-      - name: Build static executables
+      - name: Build yggstack executables
         run: |
           GOOS=windows GOARCH=arm GOARM=7 ./build -o yggstack-windows-armv7.exe
           GOOS=windows GOARCH=arm64 ./build -o yggstack-windows-arm64.exe
@@ -59,17 +60,17 @@ jobs:
           GOOS=linux GOARCH=ppc64le ./build -o yggstack-linux-ppc64le
           GOOS=linux GOARCH=riscv64 ./build -o yggstack-linux-riscv64
           GOOS=linux GOARCH=s390x ./build -o yggstack-linux-s390x
-          CC="/opt/x-tools/x86_64-multilib-linux-musl/bin/x86_64-multilib-linux-musl-gcc" CFLAGS="-m32" GOOS=linux GOARCH=386 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-i386-musl-static
-          CC="/opt/x-tools/x86_64-multilib-linux-musl/bin/x86_64-multilib-linux-musl-gcc" GOOS=linux GOARCH=amd64 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-amd64-musl-static
-          CC="/opt/x-tools/arm-unknown-linux-musleabi/bin/arm-unknown-linux-musleabi-gcc" GOOS=linux GOARCH=arm GOARM=6 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-armv6-musl-static
-          CC="/opt/x-tools/arm-unknown-linux-musleabi/bin/arm-unknown-linux-musleabi-gcc" GOOS=linux GOARCH=arm GOARM=7 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-armv7-musl-static
-          CC="/opt/x-tools/aarch64-unknown-linux-musl/bin/aarch64-unknown-linux-musl-gcc" GOOS=linux GOARCH=arm64 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-arm64-musl-static
-          CC="/opt/x-tools/mips-unknown-linux-muslsf/bin/mips-unknown-linux-muslsf-gcc" GOOS=linux GOARCH=mips GOMIPS=softfloat ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-mips-sf-musl-static
-          CC="/opt/x-tools/mipsel-unknown-linux-muslsf/bin/mipsel-unknown-linux-muslsf-gcc" GOOS=linux GOARCH=mipsle GOMIPS=softfloat ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-mipsle-sf-musl-static
-          CC="/opt/x-tools/mips64-unknown-linux-musl/bin/mips64-unknown-linux-musl-gcc" GOOS=linux GOARCH=mips64 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-mips64-musl-static
-          CC="/opt/x-tools/mips64el-unknown-linux-musl/bin/mips64el-unknown-linux-musl-gcc" GOOS=linux GOARCH=mips64le ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-mips64le-musl-static
-          CC="/opt/x-tools/riscv64-unknown-linux-musl/bin/riscv64-unknown-linux-musl-gcc" GOOS=linux GOARCH=riscv64 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-riscv64-musl-static
-          CC="/opt/x-tools/s390x-ibm-linux-musl/bin/s390x-ibm-linux-musl-gcc" GOOS=linux GOARCH=s390x ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-s390x-musl-static
+          GOOS=linux GOARCH=386 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-i386-static
+          GOOS=linux GOARCH=amd64 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-amd64-static
+          CC="/usr/bin/arm-linux-gnueabihf-gcc" GOOS=linux GOARCH=arm GOARM=6 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-armv6-static
+          CC="/usr/bin/arm-linux-gnueabihf-gcc" GOOS=linux GOARCH=arm GOARM=7 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-armv7-static
+          CC="/usr/bin/aarch64-linux-gnu-gcc" GOOS=linux GOARCH=arm64 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-arm64-static
+          CC="/usr/bin/mips-linux-gnu-gcc" GOOS=linux GOARCH=mips GOMIPS=softfloat ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-mips-sf-static
+          CC="/usr/bin/mipsel-linux-gnu-gcc" GOOS=linux GOARCH=mipsle GOMIPS=softfloat ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-mipsle-sf-static
+          CC="/usr/bin/mips64-linux-gnuabi64-gcc" GOOS=linux GOARCH=mips64 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-mips64-static
+          CC="/usr/bin/mips64el-linux-gnuabi64-gcc" GOOS=linux GOARCH=mips64le ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-mips64le-static
+          CC="/usr/bin/riscv64-linux-gnu-gcc" GOOS=linux GOARCH=riscv64 ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-riscv64-static
+          CC="/usr/bin/s390x-linux-gnu-gcc" GOOS=linux GOARCH=s390x ./build -l "-linkmode 'external' -extldflags '-static' -s" -o yggstack-linux-s390x-static
           GOOS=darwin GOARCH=arm64 ./build -o yggstack-darwin-arm64
           GOOS=darwin GOARCH=amd64 ./build -o yggstack-darwin-amd64
           GOOS=freebsd GOARCH=arm64 ./build -o yggstack-freebsd-arm64