From a0911ff6161459241022c41f0124e5ce46c711ce Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Mon, 29 May 2023 21:26:06 +0200 Subject: [PATCH 1/2] Use the correct pattern for the fallback of rb_io_descriptor() * See https://github.com/ruby/io-console/pull/43/commits/d1d9aef45ceb14365fdf0ebee3e5ea06f27da682 --- ext/etc/etc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/etc/etc.c b/ext/etc/etc.c index 6e2374e..0b3e5ff 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -68,11 +68,12 @@ void rb_deprecate_constant(VALUE mod, const char *name); #ifndef HAVE_RB_IO_DESCRIPTOR static int -rb_io_descriptor(VALUE io) { +io_descriptor_fallback(VALUE io) { rb_io_t *fptr; GetOpenFile(io, fptr); return fptr->fd; } +#define rb_io_descriptor io_descriptor_fallback #endif #ifdef HAVE_RUBY_ATOMIC_H From 57d24a226f27307581f614f60d38be6c3763219c Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Mon, 29 May 2023 21:27:35 +0200 Subject: [PATCH 2/2] Add TruffleRuby in CI --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7b326e2..5e499c6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ jobs: name: build (${{ matrix.ruby }} / ${{ matrix.os }}) strategy: matrix: - ruby: [ '3.1', '3.0', '2.7', '2.6', head ] + ruby: [ '3.1', '3.0', '2.7', '2.6', head, truffleruby, truffleruby-head ] os: [ ubuntu-latest, macos-latest ] runs-on: ${{ matrix.os }} steps: