From 8f14499af5232cfd61794219d677791d490c7f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafael@rubyonrails.org>
Date: Wed, 24 Dec 2025 22:26:11 +0000
Subject: [PATCH] Add Ruby 4.0.0

---
 .github/workflows/publish-new-image-version.yaml | 1 +
 features/src/ruby/README.md                      | 2 +-
 features/src/ruby/devcontainer-feature.json      | 4 ++--
 features/test/ruby/test.sh                       | 2 +-
 features/test/ruby/with_rbenv.sh                 | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-new-image-version.yaml b/.github/workflows/publish-new-image-version.yaml
index 5640c9f..40858de 100644
--- a/.github/workflows/publish-new-image-version.yaml
+++ b/.github/workflows/publish-new-image-version.yaml
@@ -10,6 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         RUBY_VERSION:
+          - 4.0.0
           - 3.4.8
           - 3.4.7
           - 3.4.6
diff --git a/features/src/ruby/README.md b/features/src/ruby/README.md
index 3076610..bdbce03 100644
--- a/features/src/ruby/README.md
+++ b/features/src/ruby/README.md
@@ -40,7 +40,7 @@ Installs Ruby and a version manager (mise or rbenv) along with the dependencies
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| version | The version of ruby to be installed | string | 3.4.7 |
+| version | The version of ruby to be installed | string | 4.0.0 |
 | versionManager | The version manager to use for Ruby (mise or rbenv) | string | mise |
 
 ## Customizations
diff --git a/features/src/ruby/devcontainer-feature.json b/features/src/ruby/devcontainer-feature.json
index c86140f..dd4c11c 100644
--- a/features/src/ruby/devcontainer-feature.json
+++ b/features/src/ruby/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "name": "Ruby",
     "description": "Installs Ruby and a version manager (mise or rbenv) along with libraries needed to build Ruby.",
     "documentationURL": "https://github.com/rails/devcontainer/tree/main/features/src/ruby",
@@ -19,7 +19,7 @@
     "options": {
         "version": {
             "type": "string",
-            "default": "3.4.8",
+            "default": "4.0.0",
             "description": "The ruby version to be installed"
         },
         "versionManager": {
diff --git a/features/test/ruby/test.sh b/features/test/ruby/test.sh
index 41a56c3..542960f 100644
--- a/features/test/ruby/test.sh
+++ b/features/test/ruby/test.sh
@@ -8,6 +8,6 @@ check "mise is installed" bash -c "mise --version"
 check "mise init is sourced in the bashrc" bash -c "grep 'eval \"\$(~/.local/bin/mise activate bash)\"' $HOME/.bashrc"
 check "mise idiomatic version file is enabled for ruby" bash -c "mise settings | grep idiomatic_version_file_enable_tools | grep ruby"
 check "Ruby is installed with YJIT" bash -c "RUBY_YJIT_ENABLE=1 ruby -v | grep +YJIT"
-check "Ruby version is set to 3.4.8" bash -c "mise use -g ruby | grep 3.4.8"
+check "Ruby version is set to 4.0.0" bash -c "mise use -g ruby | grep 4.0.0"
 
 reportResults
diff --git a/features/test/ruby/with_rbenv.sh b/features/test/ruby/with_rbenv.sh
index d2358fd..fb2f0a7 100644
--- a/features/test/ruby/with_rbenv.sh
+++ b/features/test/ruby/with_rbenv.sh
@@ -9,6 +9,6 @@ check "rbenv is installed" bash -c "rbenv --version"
 check "ruby-build is installed" bash -c "ls -l $HOME/.rbenv/plugins/ruby-build | grep '\-> /usr/local/share/ruby-build'"
 eval "$(rbenv init -)"
 check "Ruby is installed with YJIT" bash -c "RUBY_YJIT_ENABLE=1 ruby -v | grep +YJIT"
-check "Ruby version is set to 3.4.8" bash -c "rbenv global | grep 3.4.8"
+check "Ruby version is set to 4.0.0" bash -c "rbenv global | grep 4.0.0"
 
 reportResults