diff --git a/.github/workflows/publish-new-image-version.yaml b/.github/workflows/publish-new-image-version.yaml index f6aca87..dc85141 100644 --- a/.github/workflows/publish-new-image-version.yaml +++ b/.github/workflows/publish-new-image-version.yaml @@ -12,6 +12,7 @@ jobs: fail-fast: false matrix: RUBY_VERSION: + - 3.5.0 - 3.4.5 - 3.4.4 - 3.4.3 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e06ffab..741658b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,7 +49,7 @@ When a new Ruby version is released, we need to add it to the build matrix and p Use the automated script to update the configuration files: ```bash -bin/add-ruby-version 3.4.5 +bin/add-ruby-version 3.5.0 ``` This script will: @@ -71,8 +71,8 @@ You have two options: For immediate publishing of specific Ruby versions without cutting a new image version, run the **Publish New Ruby Versions** workflow manually. The workflow takes a list of ruby versions and image tags as inputs, formatted as comma separated arrays: ``` -ruby_versions: ["3.4.5"] -image_versions: ["ruby-1.1.0"] +ruby_versions: ["3.5.0"] +image_versions: ["ruby-2.0.2"] ``` #### Option B: Wait for next image release (automatic) diff --git a/bin/add-ruby-version b/bin/add-ruby-version index 428938c..b2d0955 100755 --- a/bin/add-ruby-version +++ b/bin/add-ruby-version @@ -8,7 +8,7 @@ * default Ruby version, bumps the feature version, and updates test files. * * Usage: bin/add-ruby-version - * Example: bin/add-ruby-version 3.4.5 + * Example: bin/add-ruby-version 3.5.0 * * The script will: * 1. Validate the version format @@ -316,7 +316,7 @@ function main() { if (args.length !== 1) { log('Usage: bin/add-ruby-version ', 'red'); - log('Example: bin/add-ruby-version 3.4.5', 'yellow'); + log('Example: bin/add-ruby-version 3.5.0', 'yellow'); process.exit(1); } @@ -324,7 +324,7 @@ function main() { // Validate version format if (!validateVersionFormat(newVersion)) { - exitWithError('Invalid version format. Expected format: x.y.z (e.g., 3.4.5)'); + exitWithError('Invalid version format. Expected format: x.y.z (e.g., 3.5.0)'); } // Validate configuration diff --git a/features/src/ruby/devcontainer-feature.json b/features/src/ruby/devcontainer-feature.json index c846403..6747db1 100644 --- a/features/src/ruby/devcontainer-feature.json +++ b/features/src/ruby/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "ruby", - "version": "2.0.1", + "version": "2.0.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", @@ -18,7 +18,7 @@ "options": { "version": { "type": "string", - "default": "3.4.5", + "default": "3.5.0", "description": "The ruby version to be installed" }, "versionManager": { diff --git a/features/test/ruby/test.sh b/features/test/ruby/test.sh index 0545b68..0dfde07 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.5" bash -c "mise use -g ruby | grep 3.4.5" +check "Ruby version is set to 3.5.0" bash -c "mise use -g ruby | grep 3.5.0" reportResults diff --git a/features/test/ruby/with_rbenv.sh b/features/test/ruby/with_rbenv.sh index 496430b..6e7cc63 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.5" bash -c "rbenv global | grep 3.4.5" +check "Ruby version is set to 3.5.0" bash -c "rbenv global | grep 3.5.0" reportResults