Skip to content

Commit 1b79b26

Browse files
committed
Use main gemfile for truffleruby/jruby
Each time they release a new X.Y, the versions in the gemfiles need to be updated in order to not fail CI. The `engine_version` can be removed but at that point might as well just use the main gemfile. During development, the main gemfile should support these two already anyways.
1 parent 865f44f commit 1b79b26

File tree

12 files changed

+25
-137
lines changed

12 files changed

+25
-137
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ updates:
2626
- '/gemfiles/3.4'
2727
- '/gemfiles/4.0'
2828
- '/gemfiles/4.1'
29-
- '/gemfiles/jruby'
30-
- '/gemfiles/truffleruby'
3129
- '/gemfiles/typecheck'
3230
schedule:
3331
interval: 'weekly'

.github/workflows/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ jobs:
105105
matrix:
106106
target:
107107
- { ruby: "head", gemfile: "4.1" }
108-
- { ruby: "jruby-10.0.0.0", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
109-
- { ruby: "truffleruby", gemfile: "truffleruby" }
108+
- { ruby: "jruby-10.0.0.0", gemfile: ".." } # https://github.com/jruby/jruby/issues/8923
109+
- { ruby: "truffleruby", gemfile: ".." }
110110
runs-on: ubuntu-latest
111111
env:
112112
PRISM_FFI_BACKEND: "true"
@@ -277,8 +277,8 @@ jobs:
277277
- { ruby: "3.4", os: "ubuntu-latest", gemfile: "3.4" }
278278
- { ruby: "4.0", os: "ubuntu-latest", gemfile: "4.0" }
279279
- { ruby: "head", os: "ubuntu-latest", gemfile: "4.1" }
280-
- { ruby: "jruby-10.0.0.0", os: "ubuntu-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
281-
- { ruby: "truffleruby", os: "ubuntu-latest", gemfile: "truffleruby" }
280+
- { ruby: "jruby-10.0.0.0", os: "ubuntu-latest", gemfile: ".." } # https://github.com/jruby/jruby/issues/8923
281+
- { ruby: "truffleruby", os: "ubuntu-latest", gemfile: ".." }
282282

283283
- { ruby: "2.7", os: "macos-latest", gemfile: "2.7" }
284284
- { ruby: "3.0", os: "macos-latest", gemfile: "3.0" }
@@ -288,8 +288,8 @@ jobs:
288288
- { ruby: "3.4", os: "macos-latest", gemfile: "3.4" }
289289
- { ruby: "4.0", os: "macos-latest", gemfile: "4.0" }
290290
- { ruby: "head", os: "macos-latest", gemfile: "4.1" }
291-
- { ruby: "jruby-10.0.0.0", os: "macos-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
292-
- { ruby: "truffleruby", os: "macos-latest", gemfile: "truffleruby" }
291+
- { ruby: "jruby-10.0.0.0", os: "macos-latest", gemfile: ".." } # https://github.com/jruby/jruby/issues/8923
292+
- { ruby: "truffleruby", os: "macos-latest", gemfile: ".." }
293293

294294
- { ruby: "2.7", os: "windows-latest", gemfile: "2.7" }
295295
- { ruby: "3.0", os: "windows-latest", gemfile: "3.0" }
@@ -299,7 +299,7 @@ jobs:
299299
- { ruby: "3.4", os: "windows-latest", gemfile: "3.4" }
300300
- { ruby: "4.0", os: "windows-latest", gemfile: "4.0" }
301301
# - { ruby: "head", os: "windows-latest", gemfile: "4.1" } TODO: No windows build yet
302-
- { ruby: "jruby-10.0.0.0", os: "windows-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
302+
- { ruby: "jruby-10.0.0.0", os: "windows-latest", gemfile: ".." } # https://github.com/jruby/jruby/issues/8923
303303
env:
304304
BUNDLE_GEMFILE: gemfiles/${{ matrix.target.gemfile }}/Gemfile
305305
runs-on: ${{ matrix.target.os }}

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ source "https://rubygems.org"
55
gemspec
66

77
gem "benchmark-ips"
8+
gem "parser"
89
gem "rake"
910
gem "rake-compiler"
11+
gem "ruby_parser"
1012
gem "test-unit"
1113

1214
platforms :mri, :mswin, :mingw, :x64_mingw do
1315
gem "ffi"
1416
gem "irb"
15-
gem "parser"
1617
gem "ruby_memcheck"
17-
gem "ruby_parser"
1818
gem "rdoc"
1919
end
2020

Gemfile.lock

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,23 @@ GEM
99
ast (2.4.3)
1010
benchmark-ips (2.14.0)
1111
date (3.5.1)
12+
date (3.5.1-java)
1213
erb (6.0.1)
14+
erb (6.0.1-java)
1315
ffi (1.17.3)
1416
io-console (0.8.2)
17+
io-console (0.8.2-java)
1518
irb (1.16.0)
1619
pp (>= 0.6.0)
1720
rdoc (>= 4.0.0)
1821
reline (>= 0.4.2)
22+
jar-dependencies (0.5.5)
1923
mini_portile2 (2.8.9)
2024
nokogiri (1.19.0)
2125
mini_portile2 (~> 2.8.2)
2226
racc (~> 1.4)
27+
nokogiri (1.19.0-java)
28+
racc (~> 1.4)
2329
onigmo (0.1.0)
2430
parser (3.3.10.0)
2531
ast (~> 2.4.1)
@@ -31,7 +37,11 @@ GEM
3137
psych (5.3.1)
3238
date
3339
stringio
40+
psych (5.3.1-java)
41+
date
42+
jar-dependencies (>= 0.1.7)
3443
racc (1.8.1)
44+
racc (1.8.1-java)
3545
rake (13.3.1)
3646
rake-compiler (1.3.1)
3747
rake
@@ -53,6 +63,7 @@ GEM
5363
tsort (0.2.0)
5464

5565
PLATFORMS
66+
java
5667
ruby
5768

5869
DEPENDENCIES

bin/prism

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ module Prism
101101
["3.4", ["3.4", "typecheck"]],
102102
["4.0", ["4.0"]],
103103
["4.1", ["4.1"]],
104-
["jruby", ["jruby"]],
105-
["truffleruby", ["truffleruby"]]
106104
].each do |ruby_version, gemfiles|
107105
gemfiles.each do |gemfile|
108106
system(

docs/releasing.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ bundle install
4949
```sh
5050
for VERSION in "2.7" "3.0" "3.1" "3.2" "3.3" "3.4" "4.0"; do docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/$VERSION/Gemfile" "ruby:$VERSION" bundle update; done
5151
chruby ruby-4.1.0-dev && BUNDLE_GEMFILE=gemfiles/4.1/Gemfile bundle install
52-
docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/jruby/Gemfile" jruby:latest bundle update
53-
BUNDLE_GEMFILE=gemfiles/truffleruby/Gemfile chruby-exec truffleruby -- bundle update
5452
```
5553

5654
* Update the cargo lockfiles:

gemfiles/jruby/Gemfile

Lines changed: 0 additions & 13 deletions
This file was deleted.

gemfiles/jruby/Gemfile.lock

Lines changed: 0 additions & 47 deletions
This file was deleted.

gemfiles/truffleruby/Gemfile

Lines changed: 0 additions & 13 deletions
This file was deleted.

gemfiles/truffleruby/Gemfile.lock

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)