Skip to content

Commit 61fa147

Browse files
committed
Merge remote-tracking branch 'upstream/master' into classish_allowed
2 parents 3aea23c + 3bf6187 commit 61fa147

263 files changed

Lines changed: 16537 additions & 9500 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/bundle-update.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111

1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v6
1515

1616
- name: Set up Ruby
1717
uses: ruby/setup-ruby@v1
1818
with:
19-
ruby-version: '3.4'
19+
ruby-version: '4.0'
2020

2121
- name: Set up git
2222
run: |

.github/workflows/c-check.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
format-check:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v6
1313
- uses: ruby/setup-ruby@v1
1414
with:
15-
ruby-version: "3.4"
15+
ruby-version: "4.0"
1616
bundler-cache: none
1717
- name: Set working directory as safe
1818
run: git config --global --add safe.directory $(pwd)
@@ -28,15 +28,17 @@ jobs:
2828
sudo apt-get install -y clang-format-20
2929
sudo ln -sf /usr/bin/clang-format-20 /usr/local/bin/clang-format
3030
clang-format --version
31+
- name: Count processors
32+
run: nproc
3133
- name: Install Re2c
3234
run: |
3335
cd /tmp
34-
curl -L https://github.com/skvadrik/re2c/archive/refs/tags/3.1.tar.gz > re2c-3.1.tar.gz
35-
tar xf re2c-3.1.tar.gz
36-
cd re2c-3.1
36+
curl -L https://github.com/skvadrik/re2c/archive/refs/tags/4.3.tar.gz > re2c-4.3.tar.gz
37+
tar xf re2c-4.3.tar.gz
38+
cd re2c-4.3
3739
autoreconf -i -W all
3840
./configure
39-
make
41+
make -j"$(nproc)" -l"$(nproc)"
4042
sudo make install
4143
- name: Update rubygems & bundler
4244
run: |

.github/workflows/comments.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
comments:
1212
runs-on: "ubuntu-latest"
1313
# env:
14-
# RUBY_COMMIT: 1b0c46daed9186b82ab4fef1a4ab225afe582ee6
14+
# RUBY_COMMIT: v4.0.0-preview2
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1717
- uses: ruby/setup-ruby@v1
1818
with:
19-
ruby-version: "3.4.5"
19+
ruby-version: "4.0.0"
2020
bundler: none
2121
- name: Install dependencies
2222
run: |

.github/workflows/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
1515
steps:
1616
- name: Dependabot metadata
17-
uses: dependabot/fetch-metadata@08eff52bf64351f401fb50d4972fa95b9f2c2d1b # v2.4.0
17+
uses: dependabot/fetch-metadata@21025c705c08248db411dc16f3619e6b5f9ea21a # v2.5.0
1818
id: metadata
1919
- name: Checkout repository
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
2121
with:
2222
fetch-depth: 0
2323
- name: Abort if blocker files are changed

.github/workflows/ruby.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ruby: ['3.2', '3.3', '3.4', head]
16+
ruby: ['3.2', '3.3', '3.4', '4.0', head]
1717
rubyopt: [""]
1818
job:
1919
- test
2020
include:
2121
- ruby: head
2222
job: stdlib_test rubocop
23-
- ruby: "3.4"
23+
- ruby: "4.0"
2424
job: stdlib_test
25-
- ruby: "3.4"
25+
- ruby: "4.0"
2626
job: test
2727
rubyopt: "--enable-frozen-string-literal"
28-
- ruby: "3.4"
28+
- ruby: "4.0"
2929
job: stdlib_test
3030
rubyopt: "--enable-frozen-string-literal"
31-
- ruby: "3.4"
31+
- ruby: "4.0"
3232
job: rubocop validate test_doc build test_generate_stdlib raap
33-
- ruby: "3.4"
33+
- ruby: "4.0"
3434
job: typecheck_test
3535
env:
3636
RANDOMIZE_STDLIB_TEST_ORDER: "true"
3737
steps:
38-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v6
3939
- uses: ruby/setup-ruby@v1
4040
with:
4141
ruby-version: ${{ matrix.ruby }}
@@ -74,9 +74,9 @@ jobs:
7474
strategy:
7575
fail-fast: false
7676
matrix:
77-
ruby: ['3.4', head]
77+
ruby: ['4.0', head]
7878
steps:
79-
- uses: actions/checkout@v4
79+
- uses: actions/checkout@v6
8080
- name: Install dependencies
8181
run: |
8282
brew install ruby-build
@@ -100,4 +100,3 @@ jobs:
100100
run: |
101101
bin/setup
102102
- run: bundle exec rake clean compile_c99
103-

.github/workflows/typecheck.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1717
- uses: ruby/setup-ruby@v1
1818
with:
19-
ruby-version: "3.3"
19+
ruby-version: "3.4"
2020
bundler: none
2121
- name: Set working directory as safe
2222
run: git config --global --add safe.directory $(pwd)

.github/workflows/valgrind.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
valgrind:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323
- uses: ruby/setup-ruby@v1
2424
with:
2525
ruby-version: "3.4"

.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ruby: ['3.2', '3.3', ucrt, mswin]
16+
ruby: ['3.4', ucrt, mswin]
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919
- name: load ruby
2020
uses: ruby/setup-ruby@v1
2121
with:

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ gem "fileutils"
2121
gem "raap"
2222
gem "activesupport", "~> 7.0"
2323
gem "extconf_compile_commands_json"
24+
gem "irb"
2425

2526
group :libs do
2627
# Libraries required for stdlib test
@@ -30,7 +31,6 @@ group :libs do
3031
gem "dbm"
3132
gem "mutex_m"
3233
gem "nkf"
33-
gem "pathname"
3434
end
3535

3636
group :profilers do
@@ -52,6 +52,7 @@ gem 'pstore'
5252

5353
group :minitest do
5454
gem "minitest"
55+
gem "minitest-mock"
5556
end
5657

5758
group :typecheck_test do

0 commit comments

Comments
 (0)