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
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ updates:
- '/gemfiles/3.3'
- '/gemfiles/3.4'
- '/gemfiles/4.0'
- '/gemfiles/4.1'
- '/gemfiles/jruby'
- '/gemfiles/truffleruby'
- '/gemfiles/typecheck'
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
fail-fast: false
matrix:
target:
- { ruby: "head", gemfile: "4.0" }
- { ruby: "head", gemfile: "4.1" }
- { ruby: "jruby-10.0.0.0", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
- { ruby: "truffleruby", gemfile: "truffleruby" }
runs-on: ubuntu-latest
Expand Down Expand Up @@ -275,7 +275,8 @@ jobs:
- { ruby: "3.2", os: "ubuntu-latest", gemfile: "3.2" }
- { ruby: "3.3", os: "ubuntu-latest", gemfile: "3.3" }
- { ruby: "3.4", os: "ubuntu-latest", gemfile: "3.4" }
- { ruby: "head", os: "ubuntu-latest", gemfile: "4.0" }
- { 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" }

Expand All @@ -285,7 +286,8 @@ jobs:
- { ruby: "3.2", os: "macos-latest", gemfile: "3.2" }
- { ruby: "3.3", os: "macos-latest", gemfile: "3.3" }
- { ruby: "3.4", os: "macos-latest", gemfile: "3.4" }
- { ruby: "head", os: "macos-latest", gemfile: "4.0" }
- { 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" }

Expand All @@ -295,7 +297,8 @@ jobs:
- { ruby: "3.2", os: "windows-latest", gemfile: "3.2" }
- { ruby: "3.3", os: "windows-latest", gemfile: "3.3" }
- { ruby: "3.4", os: "windows-latest", gemfile: "3.4" }
- { ruby: "head", os: "windows-latest", gemfile: "4.0" }
- { 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
env:
BUNDLE_GEMFILE: gemfiles/${{ matrix.target.gemfile }}/Gemfile
Expand Down
28 changes: 14 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,37 @@ GEM
specs:
ast (2.4.3)
benchmark-ips (2.14.0)
date (3.4.1)
erb (5.1.1)
ffi (1.17.2)
date (3.5.1)
erb (6.0.1)
ffi (1.17.3)
mini_portile2 (2.8.9)
nokogiri (1.18.10)
nokogiri (1.19.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
onigmo (0.1.0)
parser (3.3.9.0)
parser (3.3.10.0)
ast (~> 2.4.1)
racc
power_assert (2.0.5)
psych (5.2.6)
power_assert (3.0.1)
psych (5.3.1)
date
stringio
racc (1.8.1)
rake (13.3.0)
rake-compiler (1.3.0)
rake (13.3.1)
rake-compiler (1.3.1)
rake
rdoc (6.15.0)
rdoc (7.0.3)
erb
psych (>= 4.0.0)
tsort
ruby_memcheck (3.0.1)
nokogiri
ruby_parser (3.21.1)
ruby_parser (3.22.0)
racc (~> 1.5)
sexp_processor (~> 4.16)
sexp_processor (4.17.4)
stringio (3.1.7)
test-unit (3.7.0)
sexp_processor (4.17.5)
stringio (3.2.0)
test-unit (3.7.6)
power_assert
tsort (0.2.0)

Expand Down
1 change: 1 addition & 0 deletions bin/prism
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ module Prism
["3.3", ["3.3"]],
["3.4", ["3.4", "typecheck"]],
["4.0", ["4.0"]],
["4.1", ["4.1"]],
["jruby", ["jruby"]],
["truffleruby", ["truffleruby"]]
].each do |ruby_version, gemfiles|
Expand Down
4 changes: 2 additions & 2 deletions docs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ bundle install
* Update the version-specific lockfiles:

```sh
for VERSION in "2.7" "3.0" "3.1" "3.2" "3.3" "3.4"; 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
docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/4.0/Gemfile" ruby:4.0.0-preview2 bundle update
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
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They don't publish development versions of ruby so I went back to using chruby here.

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
```
Expand Down
6 changes: 3 additions & 3 deletions gemfiles/3.2/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GEM
ast (2.4.3)
logger (1.7.0)
mini_portile2 (2.8.9)
nokogiri (1.18.10)
nokogiri (1.19.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
onigmo (0.1.0)
Expand All @@ -28,7 +28,7 @@ GEM
ruby_parser (3.22.0)
racc (~> 1.5)
sexp_processor (~> 4.16)
sexp_processor (4.17.4)
sexp_processor (4.17.5)
test-unit (3.7.6)
power_assert

Expand All @@ -50,4 +50,4 @@ RUBY VERSION
ruby 3.2.3p157

BUNDLED WITH
2.4.19
2.6.2
4 changes: 2 additions & 2 deletions gemfiles/3.3/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GEM
ast (2.4.3)
logger (1.7.0)
mini_portile2 (2.8.9)
nokogiri (1.18.10)
nokogiri (1.19.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
onigmo (0.1.0)
Expand All @@ -28,7 +28,7 @@ GEM
ruby_parser (3.22.0)
racc (~> 1.5)
sexp_processor (~> 4.16)
sexp_processor (4.17.4)
sexp_processor (4.17.5)
test-unit (3.7.6)
power_assert

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/3.4/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GEM
ast (2.4.3)
logger (1.7.0)
mini_portile2 (2.8.9)
nokogiri (1.18.10)
nokogiri (1.19.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
onigmo (0.1.0)
Expand All @@ -28,7 +28,7 @@ GEM
ruby_parser (3.22.0)
racc (~> 1.5)
sexp_processor (~> 4.16)
sexp_processor (4.17.4)
sexp_processor (4.17.5)
test-unit (3.7.6)
power_assert

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/4.0/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

ruby ">= 3.5.0.dev"
ruby "~> 4.0.0"

gemspec path: "../.."

Expand Down
10 changes: 5 additions & 5 deletions gemfiles/4.0/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.3)
ffi (1.17.2)
ffi (1.17.3)
logger (1.7.0)
mini_portile2 (2.8.9)
nokogiri (1.18.10)
nokogiri (1.19.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
onigmo (0.1.0)
Expand All @@ -29,7 +29,7 @@ GEM
ruby_parser (3.22.0)
racc (~> 1.5)
sexp_processor (~> 4.16)
sexp_processor (4.17.4)
sexp_processor (4.17.5)
test-unit (3.7.6)
power_assert

Expand All @@ -49,7 +49,7 @@ DEPENDENCIES
test-unit

RUBY VERSION
ruby 3.5.0.dev
ruby 4.0.0

BUNDLED WITH
4.0.0.dev
4.0.3
17 changes: 17 additions & 0 deletions gemfiles/4.1/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# frozen_string_literal: true

source "https://rubygems.org"

ruby ">= 4.1.0.dev"

gemspec path: "../.."

gem "ffi"
gem "onigmo", platforms: :ruby
gem "parser"
gem "rake-compiler"
gem "rake"
gem "rbs"
gem "ruby_memcheck"
gem "ruby_parser"
gem "test-unit"
55 changes: 55 additions & 0 deletions gemfiles/4.1/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
PATH
remote: ../..
specs:
prism (1.7.0)

GEM
remote: https://rubygems.org/
specs:
ast (2.4.3)
ffi (1.17.3)
logger (1.7.0)
mini_portile2 (2.8.9)
nokogiri (1.19.0)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
onigmo (0.1.0)
parser (3.3.10.0)
ast (~> 2.4.1)
racc
power_assert (3.0.1)
racc (1.8.1)
rake (13.3.1)
rake-compiler (1.3.1)
rake
rbs (3.10.0)
logger
ruby_memcheck (3.0.1)
nokogiri
ruby_parser (3.22.0)
racc (~> 1.5)
sexp_processor (~> 4.16)
sexp_processor (4.17.5)
test-unit (3.7.6)
power_assert

PLATFORMS
ruby

DEPENDENCIES
ffi
onigmo
parser
prism!
rake
rake-compiler
rbs
ruby_memcheck
ruby_parser
test-unit

RUBY VERSION
ruby 4.1.0.dev

BUNDLED WITH
4.1.0.dev