Skip to content

Commit 8aeb996

Browse files
authored
Merge pull request #3034 from ruby/claude/ci-ruby-version-check-4v4bw0
Update outdated versions used in CI
2 parents f4ecb8b + 10e3c8b commit 8aeb996

8 files changed

Lines changed: 17 additions & 12 deletions

File tree

.github/workflows/c-check.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,13 @@ jobs:
2727
sudo apt-get install -y libdb-dev curl autoconf automake m4 libtool
2828
- name: Install clang-format from LLVM
2929
run: |
30-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
31-
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main"
30+
# The codename must match the `runs-on` image: `ubuntu-latest` is 24.04 (noble).
31+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key \
32+
| sudo gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
33+
# Written directly rather than through `apt-add-repository`, which cannot
34+
# parse `[signed-by=...]` inside a one-line `deb` shortcut.
35+
echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main" \
36+
| sudo tee /etc/apt/sources.list.d/llvm.list
3237
sudo apt-get update
3338
sudo apt-get install -y clang-format-20
3439
sudo ln -sf /usr/bin/clang-format-20 /usr/local/bin/clang-format
@@ -38,9 +43,9 @@ jobs:
3843
- name: Install Re2c
3944
run: |
4045
cd /tmp
41-
curl -L https://github.com/skvadrik/re2c/archive/refs/tags/4.3.tar.gz > re2c-4.3.tar.gz
42-
tar xf re2c-4.3.tar.gz
43-
cd re2c-4.3
46+
curl -L https://github.com/skvadrik/re2c/archive/refs/tags/4.5.1.tar.gz > re2c-4.5.1.tar.gz
47+
tar xf re2c-4.5.1.tar.gz
48+
cd re2c-4.5.1
4449
cmake --preset=linux-gcc-release-ootree-skeleton-fast
4550
cmake --build --preset=linux-gcc-release-ootree-skeleton-fast --parallel="$(nproc)"
4651
sudo ln -sf "$(pwd)"/.build/linux-gcc-release-ootree-skeleton-fast/re2c /usr/local/bin/re2c

.github/workflows/ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
ruby: ['3.2', '3.3', '3.4', '4.0', head]
19+
ruby: ['3.3', '3.4', '4.0', head]
2020
rubyopt: [""]
2121
job:
2222
- test

.github/workflows/typecheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v7
2020
- uses: ruby/setup-ruby@v1
2121
with:
22-
ruby-version: "3.4"
22+
ruby-version: "4.0"
2323
bundler: none
2424
- name: Set working directory as safe
2525
run: git config --global --add safe.directory $(pwd)

.github/workflows/wasm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
# Pinned so the smoke test is reproducible. Bump together when upgrading.
2222
WASI_SDK_VERSION: "33"
2323
WASI_SDK_RELEASE: "33.0"
24-
WASMTIME_VERSION: "v45.0.2"
24+
WASMTIME_VERSION: "v47.0.2"
2525

2626
jobs:
2727
build:

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
ruby: ['3.4', ucrt, mswin]
19+
ruby: ['4.0', ucrt, mswin]
2020
steps:
2121
- uses: actions/checkout@v7
2222
- name: load ruby

Dockerfile.jruby

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# C extensions (bigdecimal, stackprof, ...) that cannot build on JRuby. The few
1616
# gems the suite needs are installed directly, exactly as the CI does.
1717

18-
FROM jruby:10.0.6-jdk21
18+
FROM jruby:10.1.1.0-jdk21
1919

2020
# Keep in sync with .github/workflows/wasm.yml and .github/workflows/jruby.yml.
2121
ARG WASI_SDK_VERSION=33

docs/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The RBS repository contains the type definitions of Core API and Standard Librar
1313
There are some discussions whether if it is the best to have them in this repository, but we have them and continue updating the files meanwhile.
1414

1515
The target version of the bundled type definitions is the [latest _release_ of Ruby](https://www.ruby-lang.org/en/downloads/branches/) -- `4.0` as of 2026.
16-
Note, however, that the CI currently retains the tests on Ruby 3.2 as well.
16+
Note, however, that the CI runs the tests on every non-EOL Ruby -- `3.3` and later as of 2026.
1717

1818
**The core API** type definitions are in `core` directory.
1919
You will find the familiar class names in the directory, like `string.rbs` or `array.rbs`.

src/lexer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Generated by re2c 4.3 */
1+
/* Generated by re2c 4.5.1 */
22
#line 1 "src/lexer.re"
33
#include "rbs/lexer.h"
44

0 commit comments

Comments
 (0)