Skip to content

Commit 90f4d73

Browse files
sampersandsampersand
committed
Merge branch 'master' into sampersand/2025-10-17/update-querying
2 parents ff561ff + 36ba133 commit 90f4d73

268 files changed

Lines changed: 18592 additions & 10255 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@v5
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: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@ name: C Code Generation and Formatting Check
22

33
on:
44
push:
5+
branches:
6+
- master
57
pull_request: {}
68
merge_group: {}
79

810
jobs:
911
format-check:
1012
runs-on: ubuntu-latest
1113
steps:
12-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1315
- uses: ruby/setup-ruby@v1
1416
with:
15-
ruby-version: "3.4"
17+
ruby-version: "4.0"
1618
bundler-cache: none
1719
- name: Set working directory as safe
1820
run: git config --global --add safe.directory $(pwd)
@@ -36,14 +38,16 @@ jobs:
3638
curl -L https://github.com/skvadrik/re2c/archive/refs/tags/4.3.tar.gz > re2c-4.3.tar.gz
3739
tar xf re2c-4.3.tar.gz
3840
cd re2c-4.3
39-
autoreconf -i -W all
40-
./configure
41-
make -j"$(nproc)" -l"$(nproc)"
42-
sudo make install
41+
cmake --preset=linux-gcc-release-ootree-skeleton-fast
42+
cmake --build --preset=linux-gcc-release-ootree-skeleton-fast --parallel="$(nproc)"
43+
sudo ln -sf "$(pwd)"/.build/linux-gcc-release-ootree-skeleton-fast/re2c /usr/local/bin/re2c
44+
re2c --version
4345
- name: Update rubygems & bundler
4446
run: |
4547
ruby -v
4648
gem update --system
49+
- name: install erb
50+
run: gem install erb
4751
- name: bin/setup
4852
run: |
4953
bin/setup

‎.github/workflows/comments.yml‎

Lines changed: 5 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@v5
16+
- uses: actions/checkout@v6
1717
- uses: ruby/setup-ruby@v1
1818
with:
19-
ruby-version: "3.4.5"
19+
ruby-version: "4.0.1"
2020
bundler: none
2121
- name: Install dependencies
2222
run: |
@@ -26,6 +26,8 @@ jobs:
2626
run: |
2727
ruby -v
2828
gem update --system
29+
- name: install erb
30+
run: gem install erb
2931
- name: bin/setup
3032
run: |
3133
bin/setup

‎.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@v5
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: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,31 @@ 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
35+
- ruby: asan-release
36+
job: test
3537
env:
3638
RANDOMIZE_STDLIB_TEST_ORDER: "true"
3739
steps:
38-
- uses: actions/checkout@v5
40+
- uses: actions/checkout@v6
3941
- uses: ruby/setup-ruby@v1
4042
with:
4143
ruby-version: ${{ matrix.ruby }}
@@ -50,6 +52,8 @@ jobs:
5052
run: |
5153
ruby -v
5254
gem update --system
55+
- name: install erb
56+
run: gem install erb
5357
- name: bundle config set with
5458
run: |
5559
echo "NO_MINITEST=true" >> $GITHUB_ENV
@@ -66,6 +70,10 @@ jobs:
6670
- name: bin/setup
6771
run: |
6872
bin/setup
73+
- name: Configure ASAN options
74+
if: ${{ contains(matrix.ruby, 'asan') }}
75+
run: |
76+
echo "ASAN_OPTIONS=abort_on_error=1" >> $GITHUB_ENV
6977
- name: Run test
7078
run: |
7179
bundle exec rake ${{ matrix.job }}
@@ -74,9 +82,9 @@ jobs:
7482
strategy:
7583
fail-fast: false
7684
matrix:
77-
ruby: ['3.4', head]
85+
ruby: ['4.0', head]
7886
steps:
79-
- uses: actions/checkout@v5
87+
- uses: actions/checkout@v6
8088
- name: Install dependencies
8189
run: |
8290
brew install ruby-build
@@ -90,6 +98,8 @@ jobs:
9098
run: |
9199
ruby -v
92100
gem update --system
101+
- name: install erb
102+
run: gem install erb
93103
- name: clang version
94104
run: clang --version
95105
- name: bundle config set force_ruby_platform true if head
@@ -100,4 +110,3 @@ jobs:
100110
run: |
101111
bin/setup
102112
- run: bundle exec rake clean compile_c99
103-

‎.github/workflows/rust.yml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Rust
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
paths:
9+
- ".github/workflows/rust.yml"
10+
- "rust/**"
11+
- "include/**"
12+
- "src/**"
13+
14+
env:
15+
RUSTFLAGS: "-D warnings"
16+
17+
jobs:
18+
test:
19+
name: cargo:test
20+
runs-on: ${{ matrix.os }}
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
os: [ubuntu-latest, macos-latest, windows-latest]
25+
steps:
26+
- uses: actions/checkout@v6
27+
- name: Install Rust tools
28+
run: |
29+
rustup update --no-self-update stable
30+
rustup default stable
31+
- uses: actions/cache@v5
32+
with:
33+
path: |
34+
~/.cargo/registry
35+
~/.cargo/git
36+
rust/target
37+
key: ${{ runner.os }}-cargo-${{ hashFiles('rust/Cargo.lock') }}
38+
restore-keys: |
39+
${{ runner.os }}-cargo-
40+
- name: Run tests
41+
run: |
42+
cd rust
43+
cargo test --verbose
44+
45+
lint:
46+
name: cargo:lint
47+
runs-on: ubuntu-latest
48+
steps:
49+
- uses: actions/checkout@v6
50+
- name: Install Rust tools
51+
run: |
52+
rustup update --no-self-update stable
53+
rustup default stable
54+
rustup component add --toolchain stable clippy rustfmt
55+
- uses: actions/cache@v5
56+
with:
57+
path: |
58+
~/.cargo/registry
59+
~/.cargo/git
60+
rust/target
61+
key: ${{ runner.os }}-cargo-${{ hashFiles('rust/Cargo.lock') }}
62+
restore-keys: |
63+
${{ runner.os }}-cargo-
64+
- name: Check formatting
65+
run: |
66+
cd rust
67+
cargo fmt --check
68+
- name: Run clippy
69+
run: |
70+
cd rust
71+
cargo clippy

‎.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@v5
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: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,19 @@ on:
44
push:
55
branches:
66
- master
7-
paths:
8-
- "ext/**"
9-
- "include/**"
10-
- "src/**"
117
pull_request:
128
paths:
139
- "ext/**"
1410
- "include/**"
1511
- "src/**"
1612
merge_group: {}
13+
workflow_dispatch:
1714

1815
jobs:
1916
valgrind:
2017
runs-on: ubuntu-latest
2118
steps:
22-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2320
- uses: ruby/setup-ruby@v1
2421
with:
2522
ruby-version: "3.4"
@@ -40,3 +37,4 @@ jobs:
4037
- run: bundle exec rake test:valgrind
4138
env:
4239
RUBY_FREE_AT_EXIT: 1
40+
RBS_SKIP_TESTS: test/rbs_skip_tests_valgrind

‎.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@v5
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)