rake-compiler-dock 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bbe8d21de2a30484e2ec2d877bf6e2e2538c7f02d207e924716d9bb99609fbf
-  data.tar.gz: 2069a049a2a9974a98f13bfd704f60f8e07dc5741f2e0f5d18a6c4f122358875
+  metadata.gz: c37670b488779329186dd39d128aa4b8be99d4394138a9df57d1d2862acf2979
+  data.tar.gz: 397b5fb2a1cde23888eda7640a953051452b267c0ebda2d14e64bde954b1d97e
 SHA512:
-  metadata.gz: 197abac03aa2262d6893e4f79dcb9fa63bbf7018afa70d6ea7c189abc390074a36c7892b6745e8399ffbe4309686b5310c382d5227dfe9906d6bd875a561b5af
-  data.tar.gz: 184393bac4b1890e1c19567c7c80ecc3a015e78e8789232c4f00a28d7c2a6ba0209ae94e9c1ffa2dcbd58bcd9eb8a1875732c32263cdbd47499437bc0e3617aa
+  metadata.gz: 36bbf85db406a3d1a34997a110847fdcfca2fa61ae6d4f21430c931d91ee8880c0973172dfa531bc1a8284043ae5c51455411b3baee98ac589cbfafc30cba1e5
+  data.tar.gz: 92c54b094f5a8049201ee538a36d8c9f4c5e8a221476380231e4ba42f0dc4b92ee3b8e0d2dba83acfaa08d6f6cc21a2b5516ddcb9675f5e4b080db775f92d4c1

data/.github/workflows/ci.yml

@@ -0,0 +1,168 @@
+name: Build docker images
+concurrency:
+  group: "${{github.workflow}}-${{github.ref}}"
+  cancel-in-progress: true
+on: [push, pull_request]
+
+jobs:
+  # These jobs use Buildx layer caching
+  docker_build:
+    name: Build
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: x86-mingw32
+          - platform: x64-mingw-ucrt
+          - platform: x64-mingw32
+          - platform: x86-linux
+          - platform: x86_64-linux
+          - platform: x86_64-darwin
+          - platform: arm64-darwin
+          - platform: arm-linux
+          - platform: aarch64-linux
+          - platform: jruby
+
+    runs-on: ubuntu-latest
+    env:
+      PLATFORM: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: tmp/build-cache
+          key: ${{ runner.os }}-${{ matrix.platform }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.platform }}-buildx
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.0"
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+      - name: Build docker image
+        run: |
+          docker buildx create --driver docker-container --use
+          bundle exec rake build:${PLATFORM} RCD_DOCKER_BUILD="docker buildx build --cache-from=type=local,src=tmp/build-cache --cache-to=type=local,dest=tmp/build-cache-new --load"
+
+      - name: Move build cache and remove outdated layers
+        run: |
+          rm -rf tmp/build-cache
+          mv tmp/build-cache-new tmp/build-cache
+
+      - name: Build rcd_test.gem
+        run: |
+          gem build rake-compiler-dock.gemspec
+          gem install -l rake-compiler-dock-*.gem
+          cd test/rcd_test/
+          bundle install
+          bundle exec rake gem:${PLATFORM}
+
+      - name: Upload binary gem
+        uses: actions/upload-artifact@v2
+        with:
+          name: gem-${{ matrix.platform }}
+          path: test/rcd_test/pkg/*-*-*.gem
+
+      - name: Upload source gem
+        uses: actions/upload-artifact@v2
+        if: matrix.platform == 'jruby'
+        with:
+          name: gem-ruby
+          path: test/rcd_test/pkg/*-?.?.?.gem
+
+
+  job_test_native:
+    name: Test
+    needs: docker_build
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows
+            ruby: "3.0"
+            platform: x64-mingw32
+          - os: windows
+            ruby: "2.4"
+            platform: x64-mingw32
+          - os: macos
+            ruby: "3.0"
+            platform: x86_64-darwin
+          - os: macos
+            ruby: "2.4"
+            platform: x86_64-darwin
+          - os: ubuntu
+            ruby: "3.0"
+            platform: x86_64-linux
+          - os: ubuntu
+            ruby: "2.4"
+            platform: x86_64-linux
+          - os: ubuntu
+            ruby: jruby-head
+            platform: jruby
+          - os: ubuntu
+            ruby: "3.0"
+            platform: ruby
+
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - run: ruby --version
+
+      - name: Download gem from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: gem-${{ matrix.platform }}
+
+      - run: gem install --local *.gem --verbose
+
+      - name: Run tests
+        run: |
+          cd test/rcd_test/
+          bundle install
+          ruby -rrcd_test -S rake test
+
+  job_test_multiarch:
+    name: Test
+    needs: docker_build
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - from_image: amd64/centos
+            platform: x86_64-linux
+            dockerfile: centos
+          - from_image: navikey/raspbian-bullseye
+            platform: arm-linux
+            dockerfile: debian
+          - from_image: arm64v8/ubuntu
+            platform: aarch64-linux
+            dockerfile: debian
+          - from_image: i386/alpine
+            platform: x86-linux
+            dockerfile: alpine
+          - from_image: arm32v6/alpine
+            platform: arm-linux
+            dockerfile: alpine
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download gem from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: gem-${{ matrix.platform }}
+
+      - name: Build image and Run tests
+        run: |
+          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+          docker build --rm --build-arg from_image=${{matrix.from_image}} -t ruby-test -f test/env/Dockerfile.${{matrix.dockerfile}} .
+          docker run --rm -t --network=host -v `pwd`:/build ruby-test

data/.gitignore

@@ -1,9 +1,14 @@
 /.bundle/
 /.yardoc
+/Dockerfile.mri.aarch64-linux
+/Dockerfile.mri.arm-linux
+/Dockerfile.mri.arm64-darwin
+/Dockerfile.mri.arm64-linux
+/Dockerfile.mri.x64-mingw32
 /Dockerfile.mri.x86-linux
 /Dockerfile.mri.x86-mingw32
+/Dockerfile.mri.x86_64-darwin
 /Dockerfile.mri.x86_64-linux
-/Dockerfile.mri.x64-mingw32
 /Gemfile.lock
 /_yardoc/
 /coverage/
@@ -16,3 +21,8 @@
 *.o
 *.a
 mkmf.log
+.byebug_history
+test/rcd_test/Gemfile.lock
+test/rcd_test/pkg/
+test/rcd_test/tmp/
+test/rcd_test/vendor/

data/Dockerfile.jruby

@@ -1,7 +1,8 @@
 FROM ubuntu:20.04
 
+ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -y update && \
-    apt-get install -y curl git-core xz-utils wget unzip sudo gpg dirmngr openjdk-14-jdk-headless && \
+    apt-get install -y curl git-core xz-utils wget unzip sudo gpg dirmngr openjdk-17-jdk-headless maven && \
     rm -rf /var/lib/apt/lists/*
 
 # Add "rvm" as system group, to avoid conflicts with host GIDs typically starting with 1000
@@ -13,7 +14,7 @@ RUN mkdir ~/.gnupg && \
     echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf
 
 # install rvm, RVM 1.26.0+ has signed releases, source rvm for usage outside of package scripts
-RUN gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
+RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
     (curl -L http://get.rvm.io | sudo bash) && \
     bash -c " \
         source /etc/rubybashrc && \
@@ -26,7 +27,7 @@ ENV BASH_ENV /etc/rubybashrc
 # install rubies and fix permissions on
 RUN bash -c " \
     export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
-    for v in jruby-9.2.14.0 ; do \
+    for v in jruby-9.3.2.0 ; do \
         rvm install --binary \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
     done && \
     rvm cleanup all && \
@@ -46,8 +47,8 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 
 USER root
 
-RUN bash -c "rvm alias create default jruby-9.2.14.0"
-RUN echo "rvm use jruby-9.2.14.0 > /dev/null" >> /etc/rubybashrc
+RUN bash -c "rvm alias create default jruby-9.3.2.0"
+RUN echo "rvm use jruby-9.3.2.0 > /dev/null" >> /etc/rubybashrc
 
 # Add rvm to the global bashrc
 RUN echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc

data/Dockerfile.mri.erb

@@ -1,13 +1,16 @@
-FROM <%=
-  case platform
-    when /x86_64-linux/ then "quay.io/pypa/manylinux2014_x86_64"
-    when /x86-linux/ then "quay.io/pypa/manylinux2014_i686"
-    else "ubuntu:20.04"
-  end %>
-
-<% if platform=~/linux/ %>
+<%
+image = case platform
+  when /x86_64-linux/ then "quay.io/pypa/manylinux2014_x86_64"
+  when /x86-linux/ then "quay.io/pypa/manylinux2014_i686"
+  else "ubuntu:20.04"
+end
+manylinux = !!(image =~ /manylinux/)
+%>
+FROM <%= image %>
+
+<% if manylinux %>
 # install packages which rvm will require
-RUN yum install -y autoconf gcc-c++ libtool readline-devel sqlite-devel ruby openssl-devel xz cmake sudo less
+RUN yum install -y autoconf gcc-c++ libtool readline-devel sqlite-devel ruby openssl-devel xz cmake sudo less libffi-devel git wget
 
 # Prepare sudo and delete sudo as alias to gosu
 RUN rm -f /usr/local/bin/sudo && \
@@ -36,7 +39,7 @@ RUN mkdir ~/.gnupg && \
     echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf
 
 # install rvm, RVM 1.26.0+ has signed releases, source rvm for usage outside of package scripts
-RUN gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
+RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB && \
     (curl -L http://get.rvm.io | sudo bash) && \
     bash -c " \
         source /etc/rubybashrc && \
@@ -47,7 +50,7 @@ RUN gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A
 COPY build/patches /home/rvm/patches/
 
 # install rubies and fix permissions on
-ENV RVM_RUBIES 2.5.8 3.0.0
+ENV RVM_RUBIES 2.5.9 3.1.0
 RUN bash -c " \
     export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
     for v in ${RVM_RUBIES} ; do \
@@ -61,7 +64,7 @@ RUN bash -c " \
 RUN echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \
     bash -c " \
         rvm all do gem update --system --no-document && \
-        rvm all do gem install --no-document bundler 'bundler:~>1.16' 'rake-compiler:1.1.1' 'hoe:3.20.0' mini_portile rubygems-tasks mini_portile2 && \
+        rvm all do gem install --no-document bundler 'bundler:~>1.16' 'rake-compiler:1.1.6' hoe mini_portile rubygems-tasks mini_portile2 && \
         find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
 
 # Install rake-compiler's cross rubies in global dir instead of /root
@@ -72,20 +75,32 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 # Add cross compilers for Windows and Linux
 USER root
 
-<% if platform !~ /linux/ %>
+<% if platform=~/x64-mingw-ucrt/ %>
+COPY --from=larskanis/mingw64-ucrt:20.04 /build/*.deb /debs/
+RUN dpkg -i /debs/binutils-mingw-w64-x86-64_2.34-6ubuntu1.3+8.8_amd64.deb \
+    /debs/g++-mingw-w64-x86-64_9.3.0-17ubuntu1~20.04+22~exp1ubuntu4_amd64.deb \
+    /debs/gcc-mingw-w64-base_9.3.0-17ubuntu1~20.04+22~exp1ubuntu4_amd64.deb \
+    /debs/gcc-mingw-w64-x86-64_9.3.0-17ubuntu1~20.04+22~exp1ubuntu4_amd64.deb \
+    /debs/mingw-w64-common_7.0.0-2_all.deb \
+    /debs/mingw-w64-tools_7.0.0-2_amd64.deb \
+    /debs/mingw-w64-x86-64-dev_7.0.0-2_all.deb
+
+<% elsif !manylinux %>
 RUN apt-get -y update && \
     apt-get install -y <%
-if platform=~/darwin/     %> clang python lzma-dev libxml2-dev libssl-dev libc++-10-dev <% end %><%
+if platform=~/darwin/        %> clang python lzma-dev libxml2-dev libssl-dev libc++-10-dev <% end %><%
+if platform=~/aarch64-linux/ %> gcc-aarch64-linux-gnu g++-aarch64-linux-gnu <% end %><%
+if platform=~/arm-linux/     %> gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf <% end %><%
 if platform=~/x86-mingw32/   %> gcc-mingw-w64-i686 g++-mingw-w64-i686 <% end %><%
-if platform=~/x64-mingw32/ %> gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 <% end %> && \
+if platform=~/x64-mingw32/   %> gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 <% end %> && \
     rm -rf /var/lib/apt/lists/*
 <% end %>
 
 RUN bash -c " \
-        rvm alias create default 2.5.8 && \
+        rvm alias create default 3.1.0 && \
         rvm use default "
 
-<% if platform=~/linux/   %>
+<% if manylinux %>
 # Create dev tools x86-linux-*
 COPY build/mk_i686.rb /root/
 RUN bash -c " \
@@ -102,6 +117,8 @@ RUN git clone -q --depth=1 https://github.com/tpoechtrager/osxcross.git /opt/osx
     tar -cJf MacOSX11.1.sdk.tar.xz MacOSX11.1.sdk && \
     cd /opt/osxcross && \
     UNATTENDED=1 SDK_VERSION=11.1 OSX_VERSION_MIN=10.13 USE_CLANG_AS=1 ./build.sh && \
+    ln -s /usr/bin/llvm-config-10 /usr/bin/llvm-config && \
+    ENABLE_COMPILER_RT_INSTALL=1 SDK_VERSION=11.1 ./build_compiler_rt.sh && \
     rm -rf *~ build tarballs/*
 
 RUN echo "export PATH=/opt/osxcross/target/bin:\$PATH" >> /etc/rubybashrc && \
@@ -124,44 +141,65 @@ USER rvm
 COPY build/patches2 /home/rvm/patches/
 RUN bash -c " \
     for v in ${RVM_RUBIES} ; do \
-      cd /usr/local/rvm/gems/ruby-\$v/gems/rake-compiler-1.1.1 && \
-      echo applying patches to ruby-\$v /home/rvm/patches/rake-compiler-1.1.1/*.patch && \
-      ( git apply /home/rvm/patches/rake-compiler-1.1.1/*.patch || true ) && \
-      cd /usr/local/rvm/gems/ruby-\$v/gems/hoe-3.20.0 && \
-      echo applying patches to ruby-\$v /home/rvm/patches/hoe-3.20.0/*.patch && \
-      ( git apply /home/rvm/patches/hoe-3.20.0/*.patch || true ) \
+      cd /usr/local/rvm/gems/ruby-\$v/gems/rake-compiler-1.1.6 && \
+      echo applying patches to ruby-\$v /home/rvm/patches/rake-compiler-1.1.6/*.patch && \
+      ( git apply /home/rvm/patches/rake-compiler-1.1.6/*.patch || true ) \
     done "
 
 # Patch rubies for cross build
-USER root
-RUN bash -c " \
-    for v in 2.7.0 3.0.0 ; do \
-      curl -SL http://cache.ruby-lang.org/pub/ruby/\${v:0:3}/ruby-\$v.tar.xz | tar -xJC /root/ && \
-      cd /root/ruby-\$v && \
-      git apply /home/rvm/patches/ruby-\$v/*.patch && \
-      cd .. && \
-      mkdir -p /usr/local/rake-compiler/sources/ && \
-      tar cjf /usr/local/rake-compiler/sources/ruby-\$v.tar.bz2 ruby-\$v && \
-      chown rvm /usr/local/rake-compiler -R && \
-      rm -rf /root/ruby-\$v ; \
-    done "
-USER rvm
-
-
-ENV XRUBIES 3.0.0:2.7.0:2.6.0:2.5.0:2.4.0:2.3.0
+#USER root
+#RUN bash -c " \
+#    for v in 2.7.0 3.0.0 3.1.0 ; do \
+#      curl -SL http://cache.ruby-lang.org/pub/ruby/\${v:0:3}/ruby-\$v.tar.xz | tar -xJC /root/ && \
+#      cd /root/ruby-\$v && \
+#      git apply /home/rvm/patches/ruby-\$v/*.patch && \
+#      cd .. && \
+#      mkdir -p /usr/local/rake-compiler/sources/ && \
+#      tar cjf /usr/local/rake-compiler/sources/ruby-\$v.tar.bz2 ruby-\$v && \
+#      chown rvm /usr/local/rake-compiler -R && \
+#      rm -rf /root/ruby-\$v ; \
+#    done "
+#USER rvm
+
+<%
+axrubies = if platform =~ /x64-mingw-ucrt/
+  [
+    # Rubyinstaller-3.1.0+ is platform x64-mingw-ucrt
+    ["3.1.0", "3.1.0", true],
+  ]
+elsif platform =~ /x64-mingw32/
+  [
+    # Rubyinstaller prior to 3.1.0 is platform x64-mingw32
+    ["2.6.0:2.5.0:2.4.0", "2.5.9", false],
+    ["3.0.0:2.7.0", "3.1.0", true],
+  ]
+else
+  [
+    # Build xruby versions prior ruby2_keywords in parallel using ruby-2.5
+    ["2.6.0:2.5.0:2.4.0", "2.5.9", false],
+    # Build xruby versions with ruby2_keywords in parallel using ruby-3.x
+    ["3.1.0:3.0.0:2.7.0", "3.1.0", true],
+  ]
+end
+
+axrubies.each do |xrubies, rvm, parallel| %>
+ENV XRUBIES <%= xrubies %>
 
 <% strip = '-s' if platform !~ /darwin/ %>
-# Build all xruby versions in parallel
+# Build xruby versions in parallel
 # Then cleanup all build artifacts
 RUN bash -c " \
+    rvm use <%= rvm %> && \
+    export CPPFLAGS='<%= "-D__USE_MINGW_ANSI_STDIO=1" if platform=~/x64-mingw-ucrt/ %>' && \
     export CFLAGS='-O1 -fno-omit-frame-pointer -fno-fast-math -fstack-protector-strong <%= strip %>' && \
     export LDFLAGS='-pipe <%= strip %>' && \
     <%= "export LIBS='-l:libssp.a' &&" if platform =~ /mingw/ %> \
     <%= "export CC=#{target}-clang &&" if platform =~ /darwin/ %> \
-    export MAKE='make V=1' && \
+    export MAKE='make V=1 <%= "-j`nproc`" if parallel %>' && \
     rake-compiler cross-ruby VERSION=$XRUBIES HOST=<%= target %> && \
     rm -rf ~/.rake-compiler/builds ~/.rake-compiler/sources && \
     find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
+<% end %>
 
 <% if platform=~/linux/ %>
 # Avoid linking against libruby shared object.
@@ -200,7 +238,7 @@ RUN printf "1\n" | update-alternatives --config <%= target %>-gcc && \
     printf "1\n" | update-alternatives --config <%= target %>-g++
 <% end %>
 
-<% if platform=~/linux/ %>
+<% if manylinux %>
 # Enable modern compiler toolset of manylinux image
 RUN echo "export PATH=\$DEVTOOLSET_ROOTPATH/usr/bin:\$PATH" >> /etc/rubybashrc
 
@@ -222,10 +260,12 @@ RUN gcc $HOME/sigfw.c -o /usr/bin/sigfw
 
 # Install user mapper
 COPY build/runas /usr/bin/
+COPY build/rcd-env.sh /etc/profile.d/
+RUN echo "source /etc/profile.d/rcd-env.sh" >> /etc/rubybashrc
 
 # Install sudoers configuration
 COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
 
-ENV RUBY_CC_VERSION 3.0.0:2.7.0:2.6.0:2.5.0:2.4.0:2.3.0
+ENV RUBY_CC_VERSION 3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
 
 CMD bash

data/History.md

@@ -1,4 +1,22 @@
-1.1.0 / 2020-12-28
+1.2.0 / 2022-01-04
+------------------
+
+* Add Ruby-3.1 as native rvm and cross ruby versions.
+* Remove Ruby-2.2 and 2.3 from RUBY_CC_VERSION and cross rubies.
+* Add Linux cross build targets "arm-linux" and "aarch64-linux".
+* Add cross build target "x64-mingw-ucrt" for ruby-3.1 on Windows.
+* Add `wget` and `git` to Linux image.
+* Add `maven` to JRuby image.
+* Update JRuby to 9.3.2.0
+* Fix default value of platform for JRuby. #50
+* Update openjdk version from 14 to 17
+* Add a test gem and build and run it on all supported platforms on Github Actions.
+* Allow alternative build command like `docker buildx build`
+* Provide compiler-rt libraries for darwin builds. #60
+* Extract build environment from `runas` into `rcd-env.sh` and loaded it in non-interactive non-login shells. #57
+
+
+1.1.0 / 2020-12-29
 ------------------
 
 * Use ManyLinux2014 as docker base image for linux targets.