Support heroku-20 and heroku-22 (only)

This buildpack does not support heroku-24 (yet) remove this stack from the TargetId struct. It also supports heroku-20 which was previously not present.
heroku · May 14, 2024 · 610d881 · 610d881
1 parent 731d2f1
commit 610d881
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/buildpacks/ruby/src/target_id.rs b/buildpacks/ruby/src/target_id.rs
@@ -9,8 +9,8 @@ pub(crate) struct TargetId {
 }
 
 const DISTRO_VERSION_STACK: &[(&str, &str, &str)] = &[
+    ("ubuntu", "20.04", "heroku-20"),
     ("ubuntu", "22.04", "heroku-22"),
-    ("ubuntu", "24.04", "heroku-24"),
 ];
 
 #[derive(Debug, thiserror::Error)]

diff --git a/buildpacks/ruby/tests/integration_test.rs b/buildpacks/ruby/tests/integration_test.rs
@@ -40,7 +40,24 @@ fn test_migrating_metadata() {
 
 #[test]
 #[ignore = "integration test"]
-fn test_default_app() {
+fn test_default_app_ubuntu20() {
+    TestRunner::default().build(
+        BuildConfig::new("heroku/builder:20", "tests/fixtures/default_ruby"),
+        |context| {
+            assert_contains!(context.pack_stdout, "# Heroku Ruby Buildpack");
+            assert_contains!(
+                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`"#);
+
+            println!("{}", context.pack_stdout); // Needed to get full failure as `rebuild` truncates stdout
+            assert_contains!(context.pack_stdout, "Installing webrick");
+        },
+    );
+}
+
+#[test]
+#[ignore = "integration test"]
+fn test_default_app_latest_distro() {
     TestRunner::default().build(
         BuildConfig::new("heroku/builder:22", "tests/fixtures/default_ruby"),
         |context| {