Skip to content

Commit 863eef5

Browse files
kddnewtonkddnewton
authored
Merge pull request #3831 from Earlopain/update-ci
2 parents 8ecc5b0 + 1974b3a commit 863eef5

File tree

12 files changed

+110
-33
lines changed

12 files changed

+110
-33
lines changed

‎.github/dependabot.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ updates:
2525
- '/gemfiles/3.3'
2626
- '/gemfiles/3.4'
2727
- '/gemfiles/4.0'
28+
- '/gemfiles/4.1'
2829
- '/gemfiles/jruby'
2930
- '/gemfiles/truffleruby'
3031
- '/gemfiles/typecheck'

‎.github/workflows/main.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
fail-fast: false
105105
matrix:
106106
target:
107-
- { ruby: "head", gemfile: "4.0" }
107+
- { ruby: "head", gemfile: "4.1" }
108108
- { ruby: "jruby-10.0.0.0", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
109109
- { ruby: "truffleruby", gemfile: "truffleruby" }
110110
runs-on: ubuntu-latest
@@ -275,7 +275,8 @@ jobs:
275275
- { ruby: "3.2", os: "ubuntu-latest", gemfile: "3.2" }
276276
- { ruby: "3.3", os: "ubuntu-latest", gemfile: "3.3" }
277277
- { ruby: "3.4", os: "ubuntu-latest", gemfile: "3.4" }
278-
- { ruby: "head", os: "ubuntu-latest", gemfile: "4.0" }
278+
- { ruby: "4.0", os: "ubuntu-latest", gemfile: "4.0" }
279+
- { ruby: "head", os: "ubuntu-latest", gemfile: "4.1" }
279280
- { ruby: "jruby-10.0.0.0", os: "ubuntu-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
280281
- { ruby: "truffleruby", os: "ubuntu-latest", gemfile: "truffleruby" }
281282

@@ -285,7 +286,8 @@ jobs:
285286
- { ruby: "3.2", os: "macos-latest", gemfile: "3.2" }
286287
- { ruby: "3.3", os: "macos-latest", gemfile: "3.3" }
287288
- { ruby: "3.4", os: "macos-latest", gemfile: "3.4" }
288-
- { ruby: "head", os: "macos-latest", gemfile: "4.0" }
289+
- { ruby: "4.0", os: "macos-latest", gemfile: "4.0" }
290+
- { ruby: "head", os: "macos-latest", gemfile: "4.1" }
289291
- { ruby: "jruby-10.0.0.0", os: "macos-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
290292
- { ruby: "truffleruby", os: "macos-latest", gemfile: "truffleruby" }
291293

@@ -295,7 +297,8 @@ jobs:
295297
- { ruby: "3.2", os: "windows-latest", gemfile: "3.2" }
296298
- { ruby: "3.3", os: "windows-latest", gemfile: "3.3" }
297299
- { ruby: "3.4", os: "windows-latest", gemfile: "3.4" }
298-
- { ruby: "head", os: "windows-latest", gemfile: "4.0" }
300+
- { ruby: "4.0", os: "windows-latest", gemfile: "4.0" }
301+
# - { ruby: "head", os: "windows-latest", gemfile: "4.1" } TODO: No windows build yet
299302
- { ruby: "jruby-10.0.0.0", os: "windows-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923
300303
env:
301304
BUNDLE_GEMFILE: gemfiles/${{ matrix.target.gemfile }}/Gemfile

‎Gemfile.lock‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,37 @@ GEM
88
specs:
99
ast (2.4.3)
1010
benchmark-ips (2.14.0)
11-
date (3.4.1)
12-
erb (5.1.1)
13-
ffi (1.17.2)
11+
date (3.5.1)
12+
erb (6.0.1)
13+
ffi (1.17.3)
1414
mini_portile2 (2.8.9)
15-
nokogiri (1.18.10)
15+
nokogiri (1.19.0)
1616
mini_portile2 (~> 2.8.2)
1717
racc (~> 1.4)
1818
onigmo (0.1.0)
19-
parser (3.3.9.0)
19+
parser (3.3.10.0)
2020
ast (~> 2.4.1)
2121
racc
22-
power_assert (2.0.5)
23-
psych (5.2.6)
22+
power_assert (3.0.1)
23+
psych (5.3.1)
2424
date
2525
stringio
2626
racc (1.8.1)
27-
rake (13.3.0)
28-
rake-compiler (1.3.0)
27+
rake (13.3.1)
28+
rake-compiler (1.3.1)
2929
rake
30-
rdoc (6.15.0)
30+
rdoc (7.0.3)
3131
erb
3232
psych (>= 4.0.0)
3333
tsort
3434
ruby_memcheck (3.0.1)
3535
nokogiri
36-
ruby_parser (3.21.1)
36+
ruby_parser (3.22.0)
3737
racc (~> 1.5)
3838
sexp_processor (~> 4.16)
39-
sexp_processor (4.17.4)
40-
stringio (3.1.7)
41-
test-unit (3.7.0)
39+
sexp_processor (4.17.5)
40+
stringio (3.2.0)
41+
test-unit (3.7.6)
4242
power_assert
4343
tsort (0.2.0)
4444

‎bin/prism‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ module Prism
100100
["3.3", ["3.3"]],
101101
["3.4", ["3.4", "typecheck"]],
102102
["4.0", ["4.0"]],
103+
["4.1", ["4.1"]],
103104
["jruby", ["jruby"]],
104105
["truffleruby", ["truffleruby"]]
105106
].each do |ruby_version, gemfiles|

‎docs/releasing.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ bundle install
4747
* Update the version-specific lockfiles:
4848

4949
```sh
50-
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
51-
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
50+
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
51+
chruby ruby-4.1.0-dev && BUNDLE_GEMFILE=gemfiles/4.1/Gemfile bundle install
5252
docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/jruby/Gemfile" jruby:latest bundle update
5353
BUNDLE_GEMFILE=gemfiles/truffleruby/Gemfile chruby-exec truffleruby -- bundle update
5454
```

‎gemfiles/3.2/Gemfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GEM
99
ast (2.4.3)
1010
logger (1.7.0)
1111
mini_portile2 (2.8.9)
12-
nokogiri (1.18.10)
12+
nokogiri (1.19.0)
1313
mini_portile2 (~> 2.8.2)
1414
racc (~> 1.4)
1515
onigmo (0.1.0)
@@ -28,7 +28,7 @@ GEM
2828
ruby_parser (3.22.0)
2929
racc (~> 1.5)
3030
sexp_processor (~> 4.16)
31-
sexp_processor (4.17.4)
31+
sexp_processor (4.17.5)
3232
test-unit (3.7.6)
3333
power_assert
3434

@@ -50,4 +50,4 @@ RUBY VERSION
5050
ruby 3.2.3p157
5151

5252
BUNDLED WITH
53-
2.4.19
53+
2.6.2

‎gemfiles/3.3/Gemfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GEM
99
ast (2.4.3)
1010
logger (1.7.0)
1111
mini_portile2 (2.8.9)
12-
nokogiri (1.18.10)
12+
nokogiri (1.19.0)
1313
mini_portile2 (~> 2.8.2)
1414
racc (~> 1.4)
1515
onigmo (0.1.0)
@@ -28,7 +28,7 @@ GEM
2828
ruby_parser (3.22.0)
2929
racc (~> 1.5)
3030
sexp_processor (~> 4.16)
31-
sexp_processor (4.17.4)
31+
sexp_processor (4.17.5)
3232
test-unit (3.7.6)
3333
power_assert
3434

‎gemfiles/3.4/Gemfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GEM
99
ast (2.4.3)
1010
logger (1.7.0)
1111
mini_portile2 (2.8.9)
12-
nokogiri (1.18.10)
12+
nokogiri (1.19.0)
1313
mini_portile2 (~> 2.8.2)
1414
racc (~> 1.4)
1515
onigmo (0.1.0)
@@ -28,7 +28,7 @@ GEM
2828
ruby_parser (3.22.0)
2929
racc (~> 1.5)
3030
sexp_processor (~> 4.16)
31-
sexp_processor (4.17.4)
31+
sexp_processor (4.17.5)
3232
test-unit (3.7.6)
3333
power_assert
3434

‎gemfiles/4.0/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
ruby ">= 3.5.0.dev"
5+
ruby "~> 4.0.0"
66

77
gemspec path: "../.."
88

‎gemfiles/4.0/Gemfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ GEM
77
remote: https://rubygems.org/
88
specs:
99
ast (2.4.3)
10-
ffi (1.17.2)
10+
ffi (1.17.3)
1111
logger (1.7.0)
1212
mini_portile2 (2.8.9)
13-
nokogiri (1.18.10)
13+
nokogiri (1.19.0)
1414
mini_portile2 (~> 2.8.2)
1515
racc (~> 1.4)
1616
onigmo (0.1.0)
@@ -29,7 +29,7 @@ GEM
2929
ruby_parser (3.22.0)
3030
racc (~> 1.5)
3131
sexp_processor (~> 4.16)
32-
sexp_processor (4.17.4)
32+
sexp_processor (4.17.5)
3333
test-unit (3.7.6)
3434
power_assert
3535

@@ -49,7 +49,7 @@ DEPENDENCIES
4949
test-unit
5050

5151
RUBY VERSION
52-
ruby 3.5.0.dev
52+
ruby 4.0.0
5353

5454
BUNDLED WITH
55-
4.0.0.dev
55+
4.0.3

0 commit comments

Comments
 (0)