Merge pull request ged#657 from larskanis/add-musl

Add binary gems for `aarch64-linux-musl` and `x86_64-linux-musl`

Author: larskanis

.github/workflows/binary-gems.yml

@@ -28,7 +28,9 @@ jobs:
           - platform: "x64-mingw32"
           - platform: "x86-mingw32"
           - platform: "x86_64-linux"
+          - platform: "x86_64-linux-musl"
           - platform: "aarch64-linux"
+          - platform: "aarch64-linux-musl"
           - platform: "x86_64-darwin"
           - platform: "arm64-darwin"
     steps:
@@ -156,7 +158,7 @@ jobs:
 
 
   job_binary_multiarch:
-    name: multiarch (${{matrix.platform}} on ${{matrix.from_image}} ${{matrix.image_platform}})
+    name: multiarch (${{matrix.gem_platform}} on ${{matrix.from_image}} ${{matrix.image_platform}})
     needs: rcd_build
     strategy:
       fail-fast: false
@@ -166,12 +168,28 @@ jobs:
             image_platform: linux/x86_64
             gem_platform: x86_64-linux
             dockerfile: centos
+          - from_image: alpine
+            image_platform: linux/x86_64
+            gem_platform: x86_64-linux-musl
+            dockerfile: alpine
+          - from_image: alpine
+            image_platform: linux/arm64
+            gem_platform: aarch64-linux-musl
+            dockerfile: alpine
+            os: ubuntu-24.04-arm
           - from_image: alpine
             image_platform: linux/x86_64
             gem_platform: x86_64-linux
             dockerfile: alpine
+            docker_arg: "--build-arg with_pkg=gcompat"
+          - from_image: alpine
+            image_platform: linux/arm64
+            gem_platform: aarch64-linux
+            dockerfile: alpine
+            docker_arg: "--build-arg with_pkg=gcompat"
+            os: ubuntu-24.04-arm
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os || 'ubuntu-latest' }}
     steps:
       - uses: actions/checkout@v4
       - name: Download gem-${{ matrix.gem_platform }}
@@ -180,8 +198,7 @@ jobs:
           name: binary-gem-${{ matrix.gem_platform }}
       - name: Build image and Run tests
         run: |
-          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          docker build --rm --platform ${{matrix.image_platform}} --build-arg from_image=${{matrix.from_image}} -t ruby-test -f spec/env/Dockerfile.${{matrix.dockerfile}} .
+          docker build --rm --platform ${{matrix.image_platform}} --build-arg from_image=${{matrix.from_image}} ${{matrix.docker_arg}} -t ruby-test -f spec/env/Dockerfile.${{matrix.dockerfile}} .
           docker run --rm -t --network=host -v `pwd`:/build ruby-test
 
   job_binary_yugabyte:

Rakefile

@@ -50,7 +50,9 @@ CrossLibraries = [
 	['x86-mingw32', 'mingw', 'i686-w64-mingw32'],
 	['x64-mingw32', 'mingw64', 'x86_64-w64-mingw32'],
 	['x86_64-linux', 'linux-x86_64', 'x86_64-linux-gnu'],
+	['x86_64-linux-musl', 'linux-x86_64', 'x86_64-unknown-linux-musl'],
 	['aarch64-linux', 'linux-aarch64', 'aarch64-linux-gnu'],
+	['aarch64-linux-musl', 'linux-aarch64', 'aarch64-linux-musl'],
 	['x86_64-darwin', 'darwin64-x86_64', 'x86_64-apple-darwin'],
 	['arm64-darwin', 'darwin64-arm64', 'arm64-apple-darwin'],
 ].map do |platform, openssl_config, toolchain|
@@ -68,7 +70,13 @@ Rake::ExtensionTask.new do |ext|
 	ext.lib_dir        = 'lib'
 	ext.source_pattern = "*.{c,h}"
 	ext.cross_compile  = true
-	ext.cross_platform = CrossLibraries.map(&:platform)
+
+	# Activate current cross compiled platform only.
+	# This is to work around the issue that `linux` platform is selected in `linux-musl` image.
+	ext.cross_platform = CrossLibraries.map(&:platform).select do |pl|
+		m = ENV["RCD_IMAGE"]&.match(/:(?<ruby_ver>[\d\.]+)-mri-(?<platform>[-\w]+)$/)
+		m && m[:platform] == pl
+	end
 
 	ext.cross_config_options += CrossLibraries.map do |xlib|
 		{

spec/env/Dockerfile.alpine

@@ -1,8 +1,9 @@
 ARG from_image
 FROM ${from_image}
 
+ARG with_pkg
 RUN uname -a
-RUN apk add ruby ruby-rake ruby-dev git gcc make musl-dev gcompat postgresql16 sudo
+RUN apk add ruby ruby-rake ruby-dev git gcc make musl-dev postgresql16 sudo $with_pkg
 
 RUN git config --global --add safe.directory /build
 RUN ruby --version