Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/binary-gems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -170,6 +172,10 @@ jobs:
image_platform: linux/x86_64
gem_platform: x86_64-linux
dockerfile: alpine
- from_image: alpine
image_platform: linux/x86_64
gem_platform: x86_64-linux-musl
dockerfile: alpine

runs-on: ubuntu-latest
steps:
Expand All @@ -181,7 +187,7 @@ jobs:
- 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}} --build-arg gem_platform=${{matrix.gem_platform}} -t ruby-test -f spec/env/Dockerfile.${{matrix.dockerfile}} .
docker run --rm -t --network=host -v `pwd`:/build ruby-test

job_binary_yugabyte:
Expand Down
2 changes: 2 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder why this one is unknown-linux while below is linux.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cbandy I think it's because the gnu compiler is installed via the Ubuntu packages, while the musl compiler is built and installed from https://github.com/richfelker/musl-cross-make.git (see rake-compiler/rake-compiler-dock@da4268d5#diff-f840daec2e49fd92de367e204a8dc78d8713fc3ea99f724da29a841798730fa9):

$ docker run -it ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-x86_64-linux-gnu bash
root@06bb6bae360a:/# dpkg -S x86_64-linux-gnu-gcc
gcc-9: /usr/bin/x86_64-linux-gnu-gcc-ranlib-9
gcc: /usr/bin/x86_64-linux-gnu-gcc-ar
gcc: /usr/bin/x86_64-linux-gnu-gcc
gcc-9: /usr/share/man/man1/x86_64-linux-gnu-gcc-9.1.gz
gcc: /usr/share/man/man1/x86_64-linux-gnu-gcc-ranlib.1.gz
gcc: /usr/bin/x86_64-linux-gnu-gcc-ranlib
gcc: /usr/bin/x86_64-linux-gnu-gcc-nm
gcc-9: /usr/bin/x86_64-linux-gnu-gcc-ar-9
gcc-9: /usr/share/man/man1/x86_64-linux-gnu-gcc-ranlib-9.1.gz
gcc-9: /usr/share/man/man1/x86_64-linux-gnu-gcc-ar-9.1.gz
gcc: /usr/share/man/man1/x86_64-linux-gnu-gcc.1.gz
gcc: /usr/share/man/man1/x86_64-linux-gnu-gcc-ar.1.gz
gcc: /usr/share/man/man1/x86_64-linux-gnu-gcc-nm.1.gz
gcc-9: /usr/share/man/man1/x86_64-linux-gnu-gcc-nm-9.1.gz
gcc-9: /usr/bin/x86_64-linux-gnu-gcc-9
gcc-9: /usr/bin/x86_64-linux-gnu-gcc-nm-9
$ docker run -it ghcr.io/rake-compiler/rake-compiler-dock-image:1.9.1-mri-x86_64-linux-musl bash
root@e97ee7e32d0e:/# which x86_64-unknown-linux-musl-gcc
/usr/bin/x86_64-unknown-linux-musl-gcc
root@e97ee7e32d0e:/# dpkg -S x86_64-unknown-linux-musl-gcc
dpkg-query: no path found matching pattern *x86_64-unknown-linux-musl-gcc*

['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|
Expand Down
2 changes: 1 addition & 1 deletion misc/yugabyte/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
start_period: 10s

pg:
image: ruby:3.0
image: ruby:3.1
working_dir: /app
volumes:
- .:/app
Expand Down
5 changes: 4 additions & 1 deletion spec/env/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
ARG from_image
ARG gem_platform
FROM ${from_image}

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
# Conditionally install gcompat only for x86_64-linux (not x86_64-linux-musl)
RUN if [ "$gem_platform" = "x86_64-linux" ]; then apk add gcompat; fi

RUN git config --global --add safe.directory /build
RUN ruby --version
Expand Down
Loading