Skip to content

Move typecheck to main gemfile, bump versions #4207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Earlopain wants to merge 1 commit into from
Closed

Move typecheck to main gemfile, bump versions #4207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ updates:
- '/gemfiles/3.4'
- '/gemfiles/4.0'
- '/gemfiles/4.1'
# - '/gemfiles/typecheck'
- '/gemfiles/memcheck'
schedule:
interval: 'weekly'
groups:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ jobs:

typecheck:
runs-on: ubuntu-latest
env:
BUNDLE_GEMFILE: gemfiles/typecheck/Gemfile
steps:
- uses: actions/checkout@v7
- name: Set up Ruby
Expand Down Expand Up @@ -261,6 +259,7 @@ jobs:
env:
BUNDLE_WITH: 'memcheck'
BUNDLER_VERSION: '0'
BUNDLE_GEMFILE: gemfiles/memcheck/Gemfile
steps:
- uses: actions/checkout@v7
- name: Install valgrind
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ out.svg

/ext/prism/api_node.c
/fuzz/output/
/gemfiles/typecheck/bin/
/include/prism/ast.h
/include/prism/internal/diagnostic.h
/javascript/node_modules/
Expand Down
11 changes: 9 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,16 @@ platforms :mri, :windows do
gem "ffi"
gem "irb"
gem "rdoc"
end

group :memcheck, optional: true do
gem "ruby_memcheck"
platforms :mri do
group :typecheck do
gem "rbs", "< 4.1.0" # Until https://github.com/soutaro/steep/issues/2268 is fixed
gem "rbi"
gem "rbs-inline"
gem "sorbet"
gem "steep", ">= 2.1.0.dev.1"
gem "tapioca"
end
end

Expand Down
128 changes: 98 additions & 30 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,40 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.3)
benchmark (0.5.0)
benchmark-ips (2.14.0)
concurrent-ruby (1.3.8)
csv (3.3.6)
erb (6.0.7)
erb (6.0.7-java)
erubi (1.13.1)
ffi (1.17.3)
ffi (1.17.3-aarch64-linux-gnu)
ffi (1.17.3-aarch64-linux-musl)
ffi (1.17.3-arm64-darwin)
ffi (1.17.3-x86_64-darwin)
ffi (1.17.3-x86_64-linux-gnu)
ffi (1.17.3-x86_64-linux-musl)
fileutils (1.8.0)
io-console (0.8.2)
io-console (0.8.2-java)
irb (1.17.0)
pp (>= 0.6.0)
prism (>= 1.3.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jar-dependencies (0.5.7)
json (2.21.2)
json (2.21.2-java)
language_server-protocol (3.17.0.6)
listen (3.10.0)
logger
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.7.0)
lrama (0.8.0)
mini_portile2 (2.8.9)
nokogiri (1.19.1)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.19.1-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.19.1-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.19.1-arm64-darwin)
racc (~> 1.4)
nokogiri (1.19.1-java)
racc (~> 1.4)
nokogiri (1.19.1-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.19.1-x86_64-linux-gnu)
racc (~> 1.4)
nokogiri (1.19.1-x86_64-linux-musl)
racc (~> 1.4)
netrc (0.11.0)
onigmo (0.1.0)
parallel (2.1.0)
parser (3.3.10.2)
ast (~> 2.4.1)
racc
Expand All @@ -55,43 +50,111 @@ GEM
prettyprint (0.2.0)
racc (1.8.1)
racc (1.8.1-java)
rainbow (3.1.1)
rake (13.3.1)
rake-compiler (1.3.1)
rake
rake-compiler-dock (1.12.0)
rbs (4.1.3)
logger
prism (>= 1.6.0)
tsort
rbs (4.1.3-java)
jar-dependencies (>= 0.1.7)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rbi (0.4.3)
prism (~> 1.0)
rbs (>= 4.0.1)
rbs (4.0.3)
logger
prism (>= 1.6.0)
tsort
rbs-inline (0.14.0)
prism (>= 0.29)
rbs (~> 4.0)
rdoc (8.0.0)
erb
prism (>= 1.6.0)
rbs (>= 4.0.0)
tsort
reline (0.6.3)
io-console (~> 0.5)
ruby_memcheck (3.0.1)
nokogiri
require-hooks (0.4.1)
rexml (3.4.4)
ruby_parser (3.22.0)
racc (~> 1.5)
sexp_processor (~> 4.16)
rubydex (0.3.0)
rubydex (0.3.0-aarch64-linux)
rubydex (0.3.0-arm64-darwin)
rubydex (0.3.0-x86_64-darwin)
rubydex (0.3.0-x86_64-linux)
securerandom (0.4.1)
sexp_processor (4.17.5)
sorbet (0.6.13428)
sorbet-static (= 0.6.13428)
sorbet-runtime (0.6.13428)
sorbet-static (0.6.13428-aarch64-linux)
sorbet-static (0.6.13428-java)
sorbet-static (0.6.13428-universal-darwin)
sorbet-static (0.6.13428-x86_64-linux)
sorbet-static-and-runtime (0.6.13428)
sorbet (= 0.6.13428)
sorbet-runtime (= 0.6.13428)
spoom (1.8.7)
erubi (>= 1.10.0)
prism (>= 0.28.0)
rbi (>= 0.4.2)
rbs (>= 4.0.0.dev.5)
rexml (>= 3.2.6)
sorbet-static-and-runtime (>= 0.5.10187)
thor (>= 0.19.2)
steep (2.1.0.dev.1)
concurrent-ruby (>= 1.1.10)
csv (>= 3.0.9)
fileutils (>= 1.1.0)
json (>= 2.1.0)
language_server-protocol (>= 3.17.0.4, < 4.0)
listen (~> 3.0)
logger (>= 1.3.0)
parser (>= 3.2)
prism (>= 0.25.0)
rainbow (>= 2.2.2, < 4.0)
rbs (~> 4.0)
securerandom (>= 0.1)
strscan (>= 1.0.0)
terminal-table (>= 2, < 5)
uri (>= 0.12.0)
strscan (3.1.8)
strscan (3.1.8-java)
tapioca (0.19.2)
benchmark
bundler (>= 2.2.25)
netrc (>= 0.11.0)
parallel (>= 1.21.0)
rbi (>= 0.3.7)
require-hooks (>= 0.2.2)
rubydex (>= 0.1.0.beta10)
sorbet-static-and-runtime (>= 0.6.12698)
spoom (>= 1.7.16)
thor (>= 1.2.0)
tsort
terminal-table (4.0.0)
unicode-display_width (>= 1.1.1, < 4)
test-unit (3.7.7)
power_assert
thor (1.5.0)
tsort (0.2.0)
unicode-display_width (3.2.0)
unicode-emoji (~> 4.1)
unicode-emoji (4.2.0)
uri (1.1.1)

PLATFORMS
aarch64-linux
aarch64-linux-gnu
aarch64-linux-musl
arm64-darwin
java
ruby
universal-darwin
x86_64-darwin
x86_64-linux
x86_64-linux-gnu
x86_64-linux-musl

Expand All @@ -106,10 +169,15 @@ DEPENDENCIES
rake
rake-compiler
rake-compiler-dock (~> 1.12.0)
rbi
rbs (< 4.1.0)
rbs-inline
rdoc
ruby_memcheck
ruby_parser
sorbet
steep (>= 2.1.0.dev.1)
tapioca
test-unit

BUNDLED WITH
4.0.4
4.0.18
2 changes: 1 addition & 1 deletion bin/prism
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ module Prism
["3.1", ["3.1"]],
["3.2", ["3.2"]],
["3.3", ["3.3"]],
["3.4", ["3.4", "typecheck"]],
["3.4", ["3.4", "memcheck"]],
["4.0", ["4.0"]],
["4.1", ["4.1"]],
].each do |ruby_version, gemfiles|
Expand Down
8 changes: 8 additions & 0 deletions gemfiles/memcheck/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# frozen_string_literal: true

source "https://rubygems.org"

gem "rake-compiler"
gem "rake"
gem "ruby_memcheck"
gem "test-unit"
64 changes: 64 additions & 0 deletions gemfiles/memcheck/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
GEM
remote: https://rubygems.org/
specs:
nokogiri (1.19.4-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.19.4-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.19.4-arm-linux-gnu)
racc (~> 1.4)
nokogiri (1.19.4-arm-linux-musl)
racc (~> 1.4)
nokogiri (1.19.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.19.4-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.19.4-x86_64-linux-gnu)
racc (~> 1.4)
nokogiri (1.19.4-x86_64-linux-musl)
racc (~> 1.4)
power_assert (3.1.0)
racc (1.8.1)
rake (13.4.2)
rake-compiler (1.3.1)
rake
ruby_memcheck (3.0.1)
nokogiri
test-unit (3.7.8)
power_assert

PLATFORMS
aarch64-linux-gnu
aarch64-linux-musl
arm-linux-gnu
arm-linux-musl
arm64-darwin
x86_64-darwin
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
rake
rake-compiler
ruby_memcheck
test-unit

CHECKSUMS
bundler (4.0.18) sha256=02d9a17429de1847b4e0c9f27a9ee4b20c0a74c0a641b4e77195d6019e3618ac
nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f
nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af
nokogiri (1.19.4-arm-linux-gnu) sha256=a301313e38bb065d68239e79734bcd6f56fb6efaacebde29e9abf2a4735340ca
nokogiri (1.19.4-arm-linux-musl) sha256=588923c101bcfa78869734d247d25b598674323e7f22474fc468f6e5647311eb
nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527
nokogiri (1.19.4-x86_64-darwin) sha256=7fd17057d3e1f00e9954a74b3cd76595d3d4a5ef233b7ed9599047c204f70551
nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a
nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b
power_assert (3.1.0) sha256=fefe98ed5d3140628138f3f9f9194d6ece01f1320e69700d3c928adca7518251
racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
rake-compiler (1.3.1) sha256=6b351612b6e2d73ddd5563ee799bb58685176e05363db6758504bd11573d670a
ruby_memcheck (3.0.1) sha256=62d0f0fd20ed887d3269fd6507f6fe626657de4775e7c98acdcae4ff30448c80
test-unit (3.7.8) sha256=689d1ca53f4d46f678b4e5d68d8e4294f87fc5e8b9238cc4de7c5727e8d65943

BUNDLED WITH
4.0.18
14 changes: 0 additions & 14 deletions gemfiles/typecheck/Gemfile
View file
Open in desktop

This file was deleted.

Loading
Loading