Merge pull request #26 from fontist/maxirmx-update

Pinned ffi_compiler2 version to 2.0.1
fontist · Feb 11, 2024 · 43b8f83 · 43b8f83
2 parents 0259c3b + 201e76a
commit 43b8f83
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 32 deletions.
diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml
@@ -11,69 +11,69 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  BUNDLER_VER: 2.3.24
+  BUNDLER_VER: 2.4.22
 # Forcing bundler version to ensure that it is consistent everywhere and
 # does not cause bundler gem reinstalls
-# bundler/rubygems 2.3.22 is a minimal requirement to support gnu/musl differentiation
-# https://github.com/rubygems/rubygems/pull/4488
 
 jobs:
+  prepare:
+    uses: metanorma/ci/.github/workflows/prepare-rake.yml@main
+
   test:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    name: Test on Ruby ${{ matrix.ruby.version }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    continue-on-error: false
+
+    needs: prepare
+    if: needs.prepare.outputs.push-for-tag != 'true'
+
+    continue-on-error: ${{ matrix.ruby.experimental }}
     strategy:
       fail-fast: false
-      matrix:
-        ruby: [ '2.7', '3.0', '3.1' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+      max-parallel: 5
+      matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby.version }}
+          rubygems: ${{ matrix.ruby.rubygems }}
           bundler: ${{ env.BUNDLER_VER }}
           bundler-cache: true
 
       - run: bundle exec rspec
 
   metanorma:
-    name: Test with Metanorma on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    name: Test with Metanorma on Ruby ${{ matrix.ruby.version }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    continue-on-error: false
+
+    needs: prepare
+    if: needs.prepare.outputs.push-for-tag != 'true'
+
+    continue-on-error: ${{ matrix.ruby.experimental }}
+
     strategy:
       fail-fast: false
-      matrix:
-        ruby: [ '2.7', '3.0', '3.1' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+      matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: metanorma/metanorma
 
       - uses: metanorma/metanorma-build-scripts/inkscape-setup-action@main
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: "excavate"
 
       - run: 'echo ''gem "excavate", path: "./excavate"'' > Gemfile.devel'
 
-      # https://github.com/rubygems/rubygems/issues/5160
-      - if: matrix.ruby == '3.0'
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-          bundler: ${{ env.BUNDLER_VER }}
-          rubygems: latest
-
-      - if: matrix.ruby != '3.0'
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby.version }}
+          rubygems: ${{ matrix.ruby.rubygems }}
           bundler: ${{ env.BUNDLER_VER }}
           bundler-cache: true
 
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.ref, 'refs/tags/v')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: cadwallion/publish-rubygems-action@master
         env:

diff --git a/bin/rspec b/bin/rspec
@@ -15,7 +15,7 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
 bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

diff --git a/excavate.gemspec b/excavate.gemspec
@@ -40,9 +40,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "seven-zip", "~> 1.4"
   spec.add_runtime_dependency "thor", "~> 1.0"
 
+  # Workaround for https://github.com/metanorma/ruby-libmspack/issues/2
+  spec.add_development_dependency "ffi-compiler2", "= 2.0.1"
+
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "~> 1.7"
   spec.add_development_dependency "rubocop-performance", "~> 1.15"
+
   spec.metadata["rubygems_mfa_required"] = "false"
 end
 

diff --git a/lib/excavate/version.rb b/lib/excavate/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Excavate
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end