Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ updates:
- '/gemfiles/3.4'
- '/gemfiles/4.0'
- '/gemfiles/4.1'
- '/gemfiles/jruby'
- '/gemfiles/truffleruby'
- '/gemfiles/typecheck'
schedule:
interval: 'weekly'
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ jobs:
matrix:
target:
- { ruby: "head", gemfile: "4.1" }
- { ruby: "jruby-10.0.0.0", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
- { ruby: "truffleruby", gemfile: "truffleruby" }
- { ruby: "jruby-10.0.0.0", gemfile: ".." } # https://github.com/jruby/jruby/issues/8923
- { ruby: "truffleruby", gemfile: ".." }
runs-on: ubuntu-latest
env:
PRISM_FFI_BACKEND: "true"
Expand Down Expand Up @@ -277,8 +277,8 @@ jobs:
- { ruby: "3.4", os: "ubuntu-latest", gemfile: "3.4" }
- { ruby: "4.0", os: "ubuntu-latest", gemfile: "4.0" }
- { ruby: "head", os: "ubuntu-latest", gemfile: "4.1" }
- { ruby: "jruby-10.0.0.0", os: "ubuntu-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
- { ruby: "truffleruby", os: "ubuntu-latest", gemfile: "truffleruby" }
- { ruby: "jruby-10.0.0.0", os: "ubuntu-latest", gemfile: ".." } # https://github.com/jruby/jruby/issues/8923
- { ruby: "truffleruby", os: "ubuntu-latest", gemfile: ".." }

- { ruby: "2.7", os: "macos-latest", gemfile: "2.7" }
- { ruby: "3.0", os: "macos-latest", gemfile: "3.0" }
Expand All @@ -288,8 +288,8 @@ jobs:
- { ruby: "3.4", os: "macos-latest", gemfile: "3.4" }
- { ruby: "4.0", os: "macos-latest", gemfile: "4.0" }
- { ruby: "head", os: "macos-latest", gemfile: "4.1" }
- { ruby: "jruby-10.0.0.0", os: "macos-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
- { ruby: "truffleruby", os: "macos-latest", gemfile: "truffleruby" }
- { ruby: "jruby-10.0.0.0", os: "macos-latest", gemfile: ".." } # https://github.com/jruby/jruby/issues/8923
- { ruby: "truffleruby", os: "macos-latest", gemfile: ".." }

- { ruby: "2.7", os: "windows-latest", gemfile: "2.7" }
- { ruby: "3.0", os: "windows-latest", gemfile: "3.0" }
Expand All @@ -299,7 +299,7 @@ jobs:
- { ruby: "3.4", os: "windows-latest", gemfile: "3.4" }
- { ruby: "4.0", os: "windows-latest", gemfile: "4.0" }
# - { ruby: "head", os: "windows-latest", gemfile: "4.1" } TODO: No windows build yet
- { ruby: "jruby-10.0.0.0", os: "windows-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
- { ruby: "jruby-10.0.0.0", os: "windows-latest", gemfile: ".." } # https://github.com/jruby/jruby/issues/8923
env:
BUNDLE_GEMFILE: gemfiles/${{ matrix.target.gemfile }}/Gemfile
runs-on: ${{ matrix.target.os }}
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ source "https://rubygems.org"
gemspec

gem "benchmark-ips"
gem "parser"
gem "rake"
gem "rake-compiler"
gem "ruby_parser"
gem "test-unit"

platforms :mri, :mswin, :mingw, :x64_mingw do
gem "ffi"
gem "irb"
gem "parser"
gem "ruby_memcheck"
gem "ruby_parser"
gem "rdoc"
end

Expand Down
11 changes: 11 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,23 @@ GEM
ast (2.4.3)
benchmark-ips (2.14.0)
date (3.5.1)
date (3.5.1-java)
erb (6.0.1)
erb (6.0.1-java)
ffi (1.17.3)
io-console (0.8.2)
io-console (0.8.2-java)
irb (1.16.0)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jar-dependencies (0.5.5)
mini_portile2 (2.8.9)
nokogiri (1.19.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.19.0-java)
racc (~> 1.4)
onigmo (0.1.0)
parser (3.3.10.0)
ast (~> 2.4.1)
Expand All @@ -31,7 +37,11 @@ GEM
psych (5.3.1)
date
stringio
psych (5.3.1-java)
date
jar-dependencies (>= 0.1.7)
racc (1.8.1)
racc (1.8.1-java)
rake (13.3.1)
rake-compiler (1.3.1)
rake
Expand All @@ -53,6 +63,7 @@ GEM
tsort (0.2.0)

PLATFORMS
java
ruby

DEPENDENCIES
Expand Down
2 changes: 0 additions & 2 deletions bin/prism
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ module Prism
["3.4", ["3.4", "typecheck"]],
["4.0", ["4.0"]],
["4.1", ["4.1"]],
["jruby", ["jruby"]],
["truffleruby", ["truffleruby"]]
].each do |ruby_version, gemfiles|
gemfiles.each do |gemfile|
system(
Expand Down
2 changes: 0 additions & 2 deletions docs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ bundle install
```sh
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
chruby ruby-4.1.0-dev && BUNDLE_GEMFILE=gemfiles/4.1/Gemfile bundle install
docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/jruby/Gemfile" jruby:latest bundle update
BUNDLE_GEMFILE=gemfiles/truffleruby/Gemfile chruby-exec truffleruby -- bundle update
```

* Update the cargo lockfiles:
Expand Down
13 changes: 0 additions & 13 deletions gemfiles/jruby/Gemfile

This file was deleted.

47 changes: 0 additions & 47 deletions gemfiles/jruby/Gemfile.lock

This file was deleted.

13 changes: 0 additions & 13 deletions gemfiles/truffleruby/Gemfile

This file was deleted.

40 changes: 0 additions & 40 deletions gemfiles/truffleruby/Gemfile.lock

This file was deleted.

2 changes: 0 additions & 2 deletions test/prism/snapshots_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ def teardown
if RUBY_ENGINE == "truffleruby"
except.push(
"emoji_method_calls.txt",
"seattlerb/bug202.txt",
"seattlerb/magic_encoding_comment.txt"
)
end

Expand Down