From c10e5e0418950222dcd546e39c19f5adbf03ad5f Mon Sep 17 00:00:00 2001 From: Sophie Wigmore Date: Wed, 10 Apr 2024 09:33:50 -0400 Subject: [PATCH] Remove Ruby 3.0 (#700) * Remove Ruby 3.0 * Remove 3.0 integration test --- buildpack.toml | 31 ------------------------------ integration/simple_app_test.go | 35 ---------------------------------- 2 files changed, 66 deletions(-) diff --git a/buildpack.toml b/buildpack.toml index 8440ad5d..d3681c09 100644 --- a/buildpack.toml +++ b/buildpack.toml @@ -18,32 +18,6 @@ api = "0.7" [metadata.default-versions] ruby = "3.1.*" - [[metadata.dependencies]] - checksum = "sha256:0de6dcaca9e8dd1efdcf07e400eab8a7a8f19b5b5bdf206cd8da16b59f93752c" - cpe = "cpe:2.3:a:ruby-lang:ruby:3.0.5:*:*:*:*:*:*:*" - id = "ruby" - licenses = ["BSD-2-Clause", "BSD-2-Clause-NetBSD", "BSD-3-Clause", "BSD-3-Clause-No-Nuclear-License-2014", "Bison-exception-2.2", "FSFUL", "GPL-2.0-only", "GPL-2.0-or-later", "MIT", "MIT-0", "Ruby", "deprecated_GPL-2.0", "deprecated_GPL-2.0+"] - name = "Ruby" - purl = "pkg:generic/ruby@3.0.5?checksum=9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776&download_url=https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.5.tar.gz" - source = "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.5.tar.gz" - source-checksum = "sha256:9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" - stacks = ["io.buildpacks.stacks.bionic"] - uri = "https://artifacts.paketo.io/ruby/ruby_3.0.5_linux_x64_bionic_0de6dcac.tgz" - version = "3.0.5" - - [[metadata.dependencies]] - checksum = "sha256:f2dbef7e3cd197b81de4f1a9493c16a51ab9dc62b1bbbcd52f48ce8b18c996a6" - cpe = "cpe:2.3:a:ruby-lang:ruby:3.0.6:*:*:*:*:*:*:*" - id = "ruby" - licenses = ["BSD-2-Clause", "BSD-2-Clause-NetBSD", "BSD-3-Clause", "BSD-3-Clause-No-Nuclear-License-2014", "Bison-exception-2.2", "FSFUL", "GPL-2.0-only", "GPL-2.0-or-later", "MIT", "MIT-0", "Ruby", "deprecated_GPL-2.0", "deprecated_GPL-2.0+"] - name = "Ruby" - purl = "pkg:generic/ruby@3.0.6?checksum=6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e&download_url=https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.6.tar.gz" - source = "https://cache.ruby-lang.org/pub/ruby/3.0/ruby-3.0.6.tar.gz" - source-checksum = "sha256:6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" - stacks = ["io.buildpacks.stacks.bionic"] - uri = "https://artifacts.paketo.io/ruby/ruby_3.0.6_linux_x64_bionic_f2dbef7e.tgz" - version = "3.0.6" - [[metadata.dependencies]] checksum = "sha256:a9c084d0785d047f9b2394cccfb16acd326654c74f201abd6d220eef386addca" cpe = "cpe:2.3:a:ruby-lang:ruby:3.1.3:*:*:*:*:*:*:*" @@ -174,11 +148,6 @@ api = "0.7" uri = "https://artifacts.paketo.io/ruby/ruby_3.3.0_linux_x64_bionic_70d46d54.tgz" version = "3.3.0" - [[metadata.dependency-constraints]] - constraint = "3.0.*" - id = "ruby" - patches = 2 - [[metadata.dependency-constraints]] constraint = "3.1.*" id = "ruby" diff --git a/integration/simple_app_test.go b/integration/simple_app_test.go index a5aad988..620650d8 100644 --- a/integration/simple_app_test.go +++ b/integration/simple_app_test.go @@ -78,41 +78,6 @@ func testSimpleApp(t *testing.T, context spec.G, it spec.S) { Eventually(container).Should(Serve(MatchRegexp(`Hello from Ruby 3\.1\.\d+`)).OnPort(8080)) }) - // This test is not currently applicable on jammy because currently Jammy support - // only applies to one version of Ruby (version 3.1 and above) - if builder.LocalInfo.Stack.ID != "io.buildpacks.stacks.jammy" { - context("using an older version of Ruby", func() { - it("pack builds and runs the app successfully", func() { - var err error - var logs fmt.Stringer - - image, logs, err = pack.WithNoColor().Build. - WithPullPolicy("never"). - WithBuildpacks( - settings.Buildpacks.MRI.Online, - settings.Buildpacks.BuildPlan.Online, - ). - WithEnv(map[string]string{ - "BP_MRI_VERSION": "3.0.*", - "BP_LOG_LEVEL": "DEBUG", - }). - Execute(name, source) - Expect(err).ToNot(HaveOccurred(), logs.String) - - container, err = docker.Container.Run. - WithCommand("ruby run.rb"). - WithEnv(map[string]string{"PORT": "8080"}). - WithPublish("8080"). - WithPublishAll(). - Execute(image.ID) - Expect(err).NotTo(HaveOccurred()) - - Eventually(container).Should(BeAvailable(), logs.String()) - Eventually(container).Should(Serve(MatchRegexp(`Hello from Ruby 3\.0\.\d+`)).OnPort(8080)) - }) - }) - } - context("validating SBOM", func() { var ( container2 occam.Container