rake-compiler-dock 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22fdbf0b0336450a55882dd000bea66c52a43325c6de59b0721ffbc6b5360576
-  data.tar.gz: 425f0ae751dfdcd3ff2936ff387c58b20d89e297d831c8c333ddd5738a9a92c2
+  metadata.gz: d0c53a8e4fde2b4ad57875b1e8ca11037cb9d9f101b451aaea52cdcef60dc56c
+  data.tar.gz: 9be653f556704bc9725aeec603c45a83491f62dd71b7e5b5e4eccd1635864a4a
 SHA512:
-  metadata.gz: 290f60e3969979b7830ab2a69c8989c484dbdf116fc76d9424a5efb71e5a1a4ab0bb834bc6504b3db3b383b76fbdb35ea070566d5118420ebfcf8b454a85a0a3
-  data.tar.gz: ab7a5180be028e305798032e35fc2070bce0ad882ace282ec21700b74552d35bf8a80dd2b660f9c66a8247605c11277eaf79c9ee338430b8ef4511bc945f1dfc
+  metadata.gz: 0c56bc4e310a1b5eb278ceb1da8b06a6bdbea9be2ddd6acf3be2c509afe60f542b8171e1c88cdcc6df9e21087028d91df1b46763f15c571d8ca71d4be6fdddc7
+  data.tar.gz: 2b2a2504d952cfe709cf0dece45d8ef7c83ac768af42eac27ec888a36c913c9e5d2b07f0e90bdb839945d3d4570b6ada0abb01b797e1e6a5249a521c83d59a88

data/.github/workflows/ci.yml

@@ -1,12 +1,14 @@
-name: Build docker images
+name: CI
 concurrency:
   group: "${{github.workflow}}-${{github.ref}}"
   cancel-in-progress: true
 on:
   workflow_dispatch:
+  schedule:
+    - cron: "0 5 * * 3" # At 05:00 on Wednesday # https://crontab.guru/#0_5_*_*_3
   push:
     branches:
-      - main
+      - master
     tags:
       - "*.*.*"
   pull_request:
@@ -17,7 +19,7 @@ on:
 jobs:
   # These jobs use Buildx layer caching
   docker_build:
-    name: Build
+    name: build image
 
     strategy:
       fail-fast: false
@@ -38,10 +40,10 @@ jobs:
     env:
       PLATFORM: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: tmp/build-cache
           key: ${{ runner.os }}-${{ matrix.platform }}-buildx-${{ github.sha }}
@@ -57,36 +59,41 @@ jobs:
         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"
+          docker images
 
       - name: Move build cache and remove outdated layers
         run: |
           rm -rf tmp/build-cache
           mv tmp/build-cache-new tmp/build-cache
 
+      - name: Basic tests on the generated image
+        env:
+          TEST_PLATFORM: ${{ matrix.platform }}
+        run: |
+          bundle exec rake test
+
       - 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 clean clobber
           bundle exec rake gem:${PLATFORM}
 
       - name: Upload binary gem
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: gem-${{ matrix.platform }}
           path: test/rcd_test/pkg/*-*-*.gem
 
       - if: matrix.platform == 'jruby'
         name: Upload source gem
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: gem-ruby
           path: test/rcd_test/pkg/*-?.?.?.gem
 
       - if: contains(matrix.platform, 'x64-mingw')
-        name: Build static rcd_test.gem
+        name: Build static rcd_test.gem for windows
         env:
           RCD_TEST_CONFIG: "--link-static"
         run: |
@@ -98,14 +105,48 @@ jobs:
           bundle exec rake gem:${PLATFORM}
 
       - if: contains(matrix.platform, 'x64-mingw')
-        name: Upload static binary gem
-        uses: actions/upload-artifact@v2
+        name: Upload static rcd_test.gem
+        uses: actions/upload-artifact@v3
         with:
           name: gem-${{ matrix.platform }}-static
           path: test/rcd_test/pkg/*-*-*.gem
 
+  job_test_source:
+    name: source gem
+    needs: docker_build
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu
+        ruby:
+          - "3.2"
+          - "3.1"
+          - "3.0"
+          - "2.7"
+          - "2.6"
+          - "2.5"
+          - "2.4"
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Download gem-ruby
+        uses: actions/download-artifact@v3
+        with:
+          name: gem-ruby
+      - name: Install gem-ruby
+        run: gem install --local *.gem --verbose
+      - name: Run tests
+        run: |
+          cd test/rcd_test/
+          bundle install
+          ruby -rrcd_test -S rake test
+
   job_test_native:
-    name: Test (${{matrix.ruby}}, ${{matrix.platform}})
+    name: native
     needs: docker_build
     strategy:
       fail-fast: false
@@ -115,6 +156,7 @@ jobs:
           - macos
           - ubuntu
         ruby:
+          - "3.2"
           - "3.1"
           - "3.0"
           - "2.7"
@@ -128,27 +170,30 @@ jobs:
             platform: x86_64-darwin
           - os: ubuntu
             platform: x86_64-linux
-          - os: ubuntu
-            platform: ruby
           - os: ubuntu
             ruby: jruby-head
             platform: jruby
           - os: windows
             ruby: "3.1"
             platform: x64-mingw-ucrt
+          - os: windows
+            ruby: "3.2"
+            platform: x64-mingw-ucrt
         exclude:
           - os: windows
             ruby: "3.1"
+          - os: windows
+            ruby: "3.2"
 
     runs-on: ${{ matrix.os }}-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - run: ruby --version
       - name: Download gem-${{matrix.platform}}
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: gem-${{ matrix.platform }}
       - name: Install gem-${{matrix.platform}}
@@ -160,7 +205,7 @@ jobs:
           ruby -rrcd_test -S rake test
 
   job_test_native_static:
-    name: Test static (${{matrix.ruby}}, ${{matrix.platform}})
+    name: native static
     needs: docker_build
     strategy:
       fail-fast: false
@@ -168,6 +213,7 @@ jobs:
         os:
           - windows
         ruby:
+          - "3.2"
           - "3.1"
           - "3.0"
           - "2.7"
@@ -180,19 +226,24 @@ jobs:
           - os: windows
             ruby: "3.1"
             platform: x64-mingw-ucrt
+          - os: windows
+            ruby: "3.2"
+            platform: x64-mingw-ucrt
         exclude:
           - os: windows
             ruby: "3.1"
+          - os: windows
+            ruby: "3.2"
 
     runs-on: ${{ matrix.os }}-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - run: ruby --version
       - name: Download gem-${{matrix.platform}}-static
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: gem-${{ matrix.platform }}-static
       - name: Install gem-${{matrix.platform}}-static
@@ -204,7 +255,7 @@ jobs:
           ruby -rrcd_test -S rake test
 
   job_test_multiarch:
-    name: Test ${{matrix.platform}} on ${{matrix.from_image}}
+    name: multiarch (${{matrix.platform}} on ${{matrix.from_image}})
     needs: docker_build
     strategy:
       fail-fast: false
@@ -228,9 +279,9 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Download gem-${{matrix.platform}}
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: gem-${{ matrix.platform }}
       - name: Build image and Run tests

data/.github/workflows/publish-images.yml

@@ -0,0 +1,67 @@
+name: Publish docker images to GHCR
+concurrency:
+  group: "${{github.workflow}}-${{github.ref}}"
+  cancel-in-progress: true
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 3 * * 3" # At 03:00 on Wednesday # https://crontab.guru/#0_3_*_*_3
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - x86-mingw32
+          - x64-mingw-ucrt
+          - x64-mingw32
+          - x86-linux
+          - x86_64-linux
+          - x86_64-darwin
+          - arm64-darwin
+          - arm-linux
+          - aarch64-linux
+          - jruby
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use cache from primary pipeline
+        uses: actions/cache@v3
+        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.1"
+          bundler-cache: true
+      - id: rcd_config
+        run: |
+          bundle exec ruby -e ' \
+            require "rake_compiler_dock"; \
+            print "image_name="; \
+            puts RakeCompilerDock::Starter.container_image_name(:platform => %q(${{matrix.platform}})); \
+            print "snapshot_name="; \
+            puts RakeCompilerDock::Starter.container_image_name(:platform => %q(${{matrix.platform}}), :version => %q(snapshot)); \
+          ' | tee -a $GITHUB_OUTPUT
+
+      - name: Build docker image
+        env:
+          RCD_DOCKER_BUILD: docker buildx build --cache-from=type=local,src=tmp/build-cache --cache-to=type=local,dest=tmp/build-cache-new --load
+        run: |
+          docker buildx create --driver docker-container --use
+          bundle exec rake build:${{matrix.platform}}
+          # move build cache and remove outdated layers
+          rm -rf tmp/build-cache
+          mv tmp/build-cache-new tmp/build-cache
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.GITHUB_TOKEN}}
+      - run: |
+          docker images
+          docker tag ${{steps.rcd_config.outputs.image_name}} ${{steps.rcd_config.outputs.snapshot_name}}
+          docker push ${{steps.rcd_config.outputs.snapshot_name}}

data/.gitignore

@@ -4,6 +4,7 @@
 /Dockerfile.mri.arm-linux
 /Dockerfile.mri.arm64-darwin
 /Dockerfile.mri.arm64-linux
+/Dockerfile.mri.x64-mingw-ucrt
 /Dockerfile.mri.x64-mingw32
 /Dockerfile.mri.x86-linux
 /Dockerfile.mri.x86-mingw32
@@ -11,6 +12,7 @@
 /Dockerfile.mri.x86_64-linux
 /Gemfile.lock
 /_yardoc/
+/cache/
 /coverage/
 /doc/
 /pkg/

data/CONTRIBUTING.md

@@ -0,0 +1,38 @@
+# Contributing
+
+This document is intended for the rake-compiler-dock contributors.
+
+## Building a versioned image
+
+We want to preserve the cache if we can, so patch releases don't change _all_ the layers. There are a few ways to do this.
+
+
+### Using local docker
+
+If you're going to keep your local docker cache, around, you can run things in parallel:
+
+```
+bundle exec rake build
+```
+
+
+### Use a custom docker command
+
+If you're a pro and want to run a custom command and still run things in parallel:
+
+```
+export RCD_DOCKER_BUILD="docker build --arg1 --arg2"
+bundle exec rake build
+```
+
+
+### Using the buildx backend and cache
+
+Here's one way to leverage the buildx cache, which will turn off parallel builds but generates an external cache directory that can be saved and re-used:
+
+```
+export RCD_USE_BUILDX_CACHE=t
+docker buildx create --use --driver=docker-container
+bundle exec rake build
+```
+

data/Dockerfile.jruby

@@ -26,19 +26,22 @@ 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.3.2.0 ; do \
-        rvm install --binary \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
-    done && \
-    rvm cleanup all && \
-    find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
+      export CFLAGS='-s -O3 -fno-fast-math -fPIC' && \
+      for v in jruby-9.4.0.0 ; do \
+          rvm install --binary \$v --patch \$(echo ~/patches/ruby-\$v/* | tr ' ' ','); \
+      done && \
+      rvm cleanup all && \
+      find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw \
+    "
 
-# Install rake-compiler and typical gems in all Rubies
-# do not generate documentation for gems
-RUN echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \
-    bash -c " \
-        rvm all do gem install --no-document bundler 'bundler:~>1.16' rake-compiler hoe rubygems-tasks && \
-        find /usr/local/rvm -type d -print0 | sudo xargs -0 chmod g+sw "
+RUN bash -c " \
+      echo "gem: --no-ri --no-rdoc" >> ~/.gemrc && \
+      rvm all do gem update --system --no-document && \
+      rvm all do gem update --no-document && \
+      rvm all do gem install bundler --no-document && \
+      rvm all do gem install --no-document rake-compiler:1.2.1 && \
+      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
 RUN sudo mkdir -p /usr/local/rake-compiler && \
@@ -47,8 +50,8 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 
 USER root
 
-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
+RUN bash -c "rvm alias create default jruby-9.4.0.0"
+RUN echo "rvm use jruby-9.4.0.0 > /dev/null" >> /etc/rubybashrc
 
 # Add rvm to the global bashrc
 RUN echo "source /etc/profile.d/rvm.sh" >> /etc/bash.bashrc