From c1d830ebf24ab5dc250532cdb51d58a4be0b825f Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Tue, 19 Sep 2023 16:25:46 +0200 Subject: [PATCH 1/2] Use the latest truffleruby+graalvm release in CI --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c38d4f..7cb9bd9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [ '3.2', '3.1', '3.0', '2.7', '2.6', '2.5', 'jruby', 'truffleruby', 'truffleruby+graalvm-22.3.1' ] + ruby: [ '3.2', '3.1', '3.0', '2.7', '2.6', '2.5', 'jruby', 'truffleruby', 'truffleruby+graalvm' ] runs-on: ubuntu-latest steps: - name: Checkout @@ -32,8 +32,8 @@ jobs: - name: Set TRUFFLERUBYOPT run: echo "TRUFFLERUBYOPT=--jvm --polyglot" >> $GITHUB_ENV if: startsWith(matrix.ruby, 'truffleruby+graalvm') - - name: Install GraalVM js component - run: if ! gu list | grep '^js '; then gu install js; fi + - name: Install GraalJS + run: truffleruby-polyglot-get js if: startsWith(matrix.ruby, 'truffleruby+graalvm') - name: Run test From 63ec8256c643f901e5f883e1d05511e605c114fb Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Tue, 19 Sep 2023 16:41:42 +0200 Subject: [PATCH 2/2] Update documentation to install GraalJS for TruffleRuby 23.1 --- lib/execjs/graaljs_runtime.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/execjs/graaljs_runtime.rb b/lib/execjs/graaljs_runtime.rb index 86121b0..f42c906 100644 --- a/lib/execjs/graaljs_runtime.rb +++ b/lib/execjs/graaljs_runtime.rb @@ -136,8 +136,7 @@ def available? unless Polyglot.languages.include? "js" warn "The language 'js' is not available, you likely need to `export TRUFFLERUBYOPT='--jvm --polyglot'`", uplevel: 0 if $VERBOSE - warn "You also need to install the 'js' component with 'gu install js' on GraalVM 22.2+", uplevel: 0 if $VERBOSE - warn "Note that you need TruffleRuby+GraalVM and not just the TruffleRuby standalone to use #{self.class}", uplevel: 0 if $VERBOSE + warn "You also need to install the 'js' component, see https://github.com/oracle/truffleruby/blob/master/doc/user/polyglot.md#installing-other-languages", uplevel: 0 if $VERBOSE return @available = false end