Merge pull request #156 from nathan818fr/release-i686-linux-musl

Add i686-linux-musl to release targets
rdbo · Dec 8, 2023 · 2415894 · 2415894
2 parents b470cbf + fe70eba
commit 2415894
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -49,6 +49,8 @@ jobs:
               {"target": "i686-linux-gnu-static", "runs-on": "ubuntu-latest"}
               {"target": "x86_64-linux-gnu-shared", "runs-on": "ubuntu-latest"}
               {"target": "x86_64-linux-gnu-static", "runs-on": "ubuntu-latest"}
+              {"target": "i686-linux-musl-shared", "runs-on": "ubuntu-latest"}
+              {"target": "i686-linux-musl-static", "runs-on": "ubuntu-latest"}
               {"target": "x86_64-linux-musl-shared", "runs-on": "ubuntu-latest"}
               {"target": "x86_64-linux-musl-static", "runs-on": "ubuntu-latest"}
               {"target": "i686-windows-msvc-shared-md", "runs-on": "windows-2019"}

diff --git a/tools/build-release.sh b/tools/build-release.sh
@@ -8,6 +8,7 @@ declare -gr NIX_PLATFORMS=(
   x86_64-linux-gnu
   aarch64-linux-gnu
   # Linux (Alpine/musl)
+  i686-linux-musl
   x86_64-linux-musl
   aarch64-linux-musl
 )
@@ -118,11 +119,12 @@ function _build_in_docker() {
   *-linux-musl-*) docker_os=linux-musl ;;
   esac
   case "$target" in
-  i686-*)
-    # cross-compile i686 from x86_64 (CMake is no longer compiled for i686, etc.)
+  i686-linux-gnu-*)
+    # cross-compile i686 from x86_64 (CMake is no longer compiled for i686 and we can't rely on the old distro package)
     docker_platform=linux/amd64
     docker_os+='-crossbuild-i686'
     ;;
+  i686-*) docker_platform=linux/386 ;;
   x86_64-*) docker_platform=linux/amd64 ;;
   aarch64-*) docker_platform=linux/arm64 ;;
   esac