Fix Libv8::Node::Paths with RubyGems >=3.3.21 on *-linux-gnu platforms (Ported to current master)

.github/workflows/build.yml

@@ -6,7 +6,7 @@ jobs:
   rubocop:
     name: Lint (Rubocop)
     runs-on: ubuntu-20.04
-    container: ruby:2.6
+    container: ruby:2.7
     steps:
      - name: Checkout
        uses: actions/checkout@v2
@@ -25,13 +25,27 @@ jobs:
        run: apt-get update && apt-get install -y shellcheck
      - name: Shellcheck
        run: shellcheck libexec/*
+  compile-truffleruby:
+    name: Compile on truffleruby
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: truffleruby
+          bundler-cache: true
+      - run: bundle exec rake compile
   build-ruby:
     name: Build (ruby)
     outputs:
       GEM_VERSION: ${{ steps.set-metadata.outputs.GEM_VERSION }}
     runs-on: ubuntu-20.04
-    container: ruby:2.6
+    container: ruby:2.7
     steps:
+      - name: Update Rubygems and Bundler
+        run: |
+          gem update --system 3.3.26
+          gem install bundler -v '~> 2.3.26'
       - name: Checkout
         uses: actions/checkout@v2
       - name: Bundle
@@ -73,11 +87,14 @@ jobs:
       matrix:
         platform:
           - x86_64
-          # arm64
+          - arm64
     name: Build (darwin)
     outputs:
       GEM_VERSION: ${{ steps.set-metadata.outputs.GEM_VERSION }}
-    runs-on: macos-10.15
+    runs-on: macos-11
+    env:
+      TARGET_PLATFORM: ${{ matrix.platform }}-darwin
+      RUBY_TARGET_PLATFORM: ${{ matrix.platform }}-darwin
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -115,6 +132,14 @@ jobs:
       - name: Inject V8
         run: |
             ./libexec/inject-libv8 ${{ steps.set-metadata.outputs.NODE_VERSION }}
+      - name: Test V8 in C++
+        if: matrix.platform != 'arm64'
+        run: |
+            cd test/gtest
+            cmake -S . -B build
+            cd build
+            cmake --build .
+            ./c_v8_tests
       - name: Build binary gem
         run: |
             bundle exec rake binary
@@ -188,10 +213,10 @@ jobs:
         run: |
           case ${{ matrix.libc }} in
             gnu)
-              echo 'ruby:2.4'
+              echo 'ruby:2.7'
               ;;
             musl)
-              echo 'ruby:2.4-alpine'
+              echo 'ruby:2.7-alpine'
               ;;
           esac | tee container_image
           echo "::set-output name=image::$(cat container_image)"
@@ -200,12 +225,20 @@ jobs:
           echo "::set-output name=id::$(cat container_id)"
       - name: Install Alpine system dependencies
         if: ${{ matrix.libc == 'musl' }}
-        run: docker exec -w "${PWD}" ${{ steps.container.outputs.id }} apk add --no-cache build-base linux-headers bash python2 python3 git curl tar
+        run: docker exec -w "${PWD}" ${{ steps.container.outputs.id }} apk add --no-cache build-base linux-headers bash python3 git curl tar cmake
+      - name: Install Debian system dependencies
+        if: ${{ matrix.libc == 'gnu' }}
+        run: |
+          docker exec -w "${PWD}" ${{ steps.container.outputs.id }} apt-get update
+          docker exec -w "${PWD}" ${{ steps.container.outputs.id }} apt-get install -y cmake
       - name: Install Debian cross-compiler
         if: ${{ matrix.libc == 'gnu' && matrix.platform != 'amd64' }}
         run: |
-          docker exec -w "${PWD}" ${{ steps.container.outputs.id }} apt-get update
           docker exec -w "${PWD}" ${{ steps.container.outputs.id }} apt-get install -y binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+      - name: Update Rubygems and Bundler
+        run: |
+          docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem update --system 3.3.26
+          docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem install bundler -v '~> 2.3.26'
       - name: Checkout
         uses: actions/checkout@v2
       - name: Bundle
@@ -242,6 +275,10 @@ jobs:
       - name: Inject V8
         run: |
             docker exec -w "${PWD}" ${{ steps.container.outputs.id }} ./libexec/inject-libv8 ${{ steps.set-metadata.outputs.NODE_VERSION }}
+      - name: Test V8 in C++
+        if: matrix.platform != 'arm64'
+        run: |
+            docker exec -w "${PWD}" ${{ steps.container.outputs.id }} bash -c "cd test/gtest && cmake -S . -B build && cd build && cmake --build . && ctest"
       - name: Build binary gem
         run: |
             docker exec -w "${PWD}" ${{ steps.container.outputs.id }} bundle exec rake binary[${{ steps.platform.outputs.ruby_target_platform }}]
@@ -256,11 +293,49 @@ jobs:
           name: gem-${{ steps.set-metadata.outputs.GEM_VERSION  }}-${{ steps.platform.outputs.ruby_target_platform }}
           path: pkg
   test-ruby:
-    name: Test (ruby)
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - amd64
+          # other platforms would need emulation, which is way too slow
+        container:
+          - image: ruby:2.7
+            version: '2.7'
+            libc: gnu
+          - image: ruby:2.7-alpine
+            version: '2.7'
+            libc: musl
+          - image: ruby:3.0
+            version: '3.0'
+            libc: gnu
+          - image: ruby:3.0-alpine
+            version: '3.0'
+            libc: musl
+          - image: ruby:3.1
+            version: '3.1'
+            libc: gnu
+          - image: ruby:3.1-alpine
+            version: '3.1'
+            libc: musl
+          - image: ruby:3.2
+            version: '3.2'
+            libc: gnu
+          - image: ruby:3.2-alpine
+            version: '3.2'
+            libc: musl
+    name: Test (ruby) (${{ matrix.container.version }}, ${{ matrix.platform }}, ${{ matrix.container.libc }})
     needs: build-ruby
     runs-on: ubuntu-20.04
-    container: ruby:2.5
+    container: ${{ matrix.container.image }}
     steps:
+      - name: Install Alpine system dependencies
+        if: ${{ matrix.container.libc == 'musl' }}
+        run: apk add --no-cache build-base linux-headers bash python3 git curl tar
+      - name: Update Rubygems and Bundler
+        run: |
+          gem update --system 3.3.26
+          gem install bundler -v '~> 2.3.26'
       - name: Set metadata
         id: set-metadata
         run: |
@@ -275,13 +350,15 @@ jobs:
         run: gem install --verbose pkg/libv8-node-${{ needs.build-ruby.outputs.GEM_VERSION }}.gem
       - name: Test with mini_racer
         run: |
+          export BUNDLE_FORCE_RUBY_PLATFORM=y
           git clone https://github.com/rubyjs/mini_racer.git test/mini_racer --depth 1
           cd test/mini_racer
-          git fetch origin refs/pull/210/head
-          git checkout FETCH_HEAD
+          git fetch origin v0.6.3
+          git checkout -f FETCH_HEAD
           git reset --hard
           git clean -f -d -x
           ruby -i -ne '$_ =~ /^\s+LIBV8_NODE_VERSION/ ? print("  LIBV8_NODE_VERSION = \"${{ needs.build-ruby.outputs.GEM_VERSION }}\"\n") : print' lib/mini_racer/version.rb
+          ruby -i -ne '$_ =~ /spec.required_ruby_version/ ? "" : print' mini_racer.gemspec
           bundle install
           bundle exec rake compile
           bundle exec rake test
@@ -294,7 +371,7 @@ jobs:
           # arm64
     name: Test (darwin)
     needs: build-darwin
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - name: Set metadata
         id: set-metadata
@@ -312,11 +389,12 @@ jobs:
         run: |
           git clone https://github.com/rubyjs/mini_racer.git test/mini_racer --depth 1
           cd test/mini_racer
-          git fetch origin refs/pull/210/head
-          git checkout FETCH_HEAD
+          git fetch origin v0.6.3
+          git checkout -f FETCH_HEAD
           git reset --hard
           git clean -f -d -x
           ruby -i -ne '$_ =~ /^\s+LIBV8_NODE_VERSION/ ? print("  LIBV8_NODE_VERSION = \"${{ needs.build-darwin.outputs.GEM_VERSION }}\"\n") : print' lib/mini_racer/version.rb
+          ruby -i -ne '$_ =~ /spec.required_ruby_version/ ? "" : print' mini_racer.gemspec
           bundle install
           bundle exec rake compile
           bundle exec rake test
@@ -325,10 +403,10 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '2.5'
-          - '2.6'
           - '2.7'
           - '3.0'
+          - '3.1'
+          - '3.2'
         platform:
           - amd64
           # arm64
@@ -339,16 +417,16 @@ jobs:
           - gnu
           - musl
         include:
-          - version: '2.5'
+          - version: '2.7'
             platform: 'arm64'
             libc: 'gnu'
-          - version: '2.6'
+          - version: '3.0'
             platform: 'arm64'
             libc: 'gnu'
-          - version: '2.7'
+          - version: '3.1'
             platform: 'arm64'
             libc: 'gnu'
-          - version: '3.0'
+          - version: '3.2'
             platform: 'arm64'
             libc: 'gnu'
     name: Test (linux)
@@ -379,10 +457,14 @@ jobs:
       - name: Install Alpine system dependencies
         if: ${{ matrix.libc == 'musl' }}
         run: docker exec -w "${PWD}" ${{ steps.container.outputs.id }} apk add --no-cache build-base git libstdc++
+      - name: Update Rubygems and Bundler
+        run: |
+          docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem update --system 3.3.26
+          docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem install bundler -v '~> 2.3.26'
       - name: Set metadata
         id: set-metadata
         run: |
-            docker exec -w "${PWD}" ${{ steps.container.outputs.id }} ruby -e 'puts Gem.platforms.last.to_s' | tee gem_platform
+            docker exec -w "${PWD}" ${{ steps.container.outputs.id }} ruby -e 'puts Gem::Platform.local.tap { |p| RUBY_PLATFORM =~ /musl/ && p.version.nil? and p.instance_eval { @version = "musl" } }.to_s' | tee gem_platform
             echo "::set-output name=GEM_PLATFORM::$(cat gem_platform)"
       - name: Download a single artifact
         uses: actions/download-artifact@v2
@@ -395,11 +477,12 @@ jobs:
         run: |
           git clone https://github.com/rubyjs/mini_racer.git test/mini_racer --depth 1
           cd test/mini_racer
-          git fetch origin refs/pull/210/head
-          git checkout FETCH_HEAD
+          git fetch origin v0.6.3
+          git checkout -f FETCH_HEAD
           git reset --hard
           git clean -f -d -x
           ruby -i -ne '$_ =~ /^\s+LIBV8_NODE_VERSION/ ? print("  LIBV8_NODE_VERSION = \"${{ needs.build-linux.outputs.GEM_VERSION }}\"\n") : print' lib/mini_racer/version.rb
+          ruby -i -ne '$_ =~ /spec.required_ruby_version/ ? "" : print' mini_racer.gemspec
           docker exec -w "${PWD}" ${{ steps.container.outputs.id }} bundle install
           docker exec -w "${PWD}" ${{ steps.container.outputs.id }} bundle exec rake compile
           docker exec -w "${PWD}" ${{ steps.container.outputs.id }} bundle exec rake test

.gitignore

@@ -6,6 +6,7 @@
 Makefile
 /ext/libv8-node/.location.yml
 /test/mini_racer
+/test/bundle
 *.nix
 *.vim
 .envrc

.rubocop.yml

@@ -1,9 +1,12 @@
 AllCops:
+  SuggestExtensions: false
+  NewCops: disable
   TargetRubyVersion: 2.0
   Exclude:
     - src/**/*
     - pkg/**/*
     - vendor/**/*
+    - test/**/*
 
 Naming/FileName:
   Exclude:
@@ -26,3 +29,6 @@ Style/WordArray:
 
 Style/PerlBackrefs:
   Enabled: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false

Dockerfile

@@ -1,20 +1,26 @@
-ARG RUBY_VERSION=2.4
+ARG RUBY_VERSION=2.7
 FROM ruby:${RUBY_VERSION}
 
-RUN test ! -f /etc/alpine-release || apk add --no-cache build-base bash python2 python3 git curl tar
+RUN test ! -f /etc/alpine-release || apk add --no-cache build-base bash python3 git curl tar ccache
+RUN test -f /etc/alpine-release || (apt-get update && apt-get install -y ccache)
+ENV CCACHE_DIR=/ccache
+
+RUN gem update --system 3.3.26 && gem install bundler -v '~> 2.3.26'
 
 RUN mkdir -p /code
 WORKDIR /code
 
-ARG NODE_VERSION=16.10.0
+ARG NODE_VERSION=16.19.0
 
+COPY sums/v${NODE_VERSION}.sum /code/sums/
 COPY libexec/download-node /code/libexec/
 RUN ./libexec/download-node ${NODE_VERSION}
 COPY libexec/extract-node /code/libexec/
 COPY patch/* /code/patch/
 RUN ./libexec/extract-node ${NODE_VERSION}
+COPY libexec/platform /code/libexec/
 COPY libexec/build-libv8 /code/libexec/
-RUN ./libexec/build-libv8 ${NODE_VERSION}
+RUN --mount=type=cache,id=ccache,target=/ccache/ ./libexec/build-libv8 ${NODE_VERSION}
 COPY libexec/build-monolith /code/libexec/
 RUN ./libexec/build-monolith ${NODE_VERSION}
 COPY libexec/inject-libv8 /code/libexec/