Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update default bundler and ruby versions #374

Merged
merged 3 commits into from
Dec 16, 2024
Merged

Update default bundler and ruby versions #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a894bf
Update default bundler and ruby versions
schneems Dec 16, 2024
d67f0f0
Disable metadata migration test
schneems Dec 16, 2024
804e5aa
Update jruby version for integration test
schneems Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions buildpacks/ruby/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Default Ruby version is now 3.2.6 ([#374](https://github.com/heroku/buildpacks-ruby/pull/374))
- Default Bundler version is now 2.5.6 ([#374](https://github.com/heroku/buildpacks-ruby/pull/374))

## [4.0.2] - 2024-12-16

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions buildpacks/ruby/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ impl Buildpack for RubyBuildpack {
let lockfile_contents = fs_err::read_to_string(&lockfile)
.map_err(|error| RubyBuildpackError::MissingGemfileLock(lockfile, error))?;
let gemfile_lock = GemfileLock::from_str(&lockfile_contents).expect("Infallible");
let bundler_version = gemfile_lock.resolve_bundler("2.4.5");
let ruby_version = gemfile_lock.resolve_ruby("3.1.3");
let bundler_version = gemfile_lock.resolve_bundler("2.5.6");
let ruby_version = gemfile_lock.resolve_ruby("3.2.6");

// ## Install metrics agent
build_output = {
Expand Down
8 changes: 4 additions & 4 deletions buildpacks/ruby/tests/integration_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fn test_migrating_metadata() {
// Remove the return and update the `buildpack-ruby` reference to the latest version.
#![allow(unreachable_code)]
// Test v4.0.2 compatible with v4.0.1
// return;
return;

let builder = "heroku/builder:24";
let app_dir = "tests/fixtures/default_ruby";
Expand Down Expand Up @@ -148,7 +148,7 @@ fn test_jruby_app() {
r#"
source "https://rubygems.org"

ruby '2.6.8', engine: 'jruby', engine_version: '9.3.6.0'
ruby '3.1.4', engine: 'jruby', engine_version: '9.4.8.0'
"#,
)
.unwrap();
Expand All @@ -162,7 +162,7 @@ GEM
PLATFORMS
java
RUBY VERSION
ruby 2.6.8p001 (jruby 9.3.6.0)
ruby 3.1.4p001 (jruby 9.4.8.0)
DEPENDENCIES
",
)
Expand All @@ -183,7 +183,7 @@ DEPENDENCIES
context.pack_stdout,
r#"`BUNDLE_BIN="/layers/heroku_ruby/gems/bin" BUNDLE_CLEAN="1" BUNDLE_DEPLOYMENT="1" BUNDLE_GEMFILE="/workspace/Gemfile" BUNDLE_PATH="/layers/heroku_ruby/gems" BUNDLE_WITHOUT="development:test" bundle install`"#
);
assert_contains!(context.pack_stdout, "Ruby version `2.6.8-jruby-9.3.6.0` from `Gemfile.lock`");
assert_contains!(context.pack_stdout, "Ruby version `3.1.4-jruby-9.4.8.0` from `Gemfile.lock`");
});
}

Expand Down