Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion fixtures/util/override_buildpack/override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ ruby:
file: BUILDPACK_DIR/node.tgz
sha256: 062d906c87839d03b243e2821e10653c89b4c92878bfe2bf995dec231e117bfc
cf_stacks:
- cflinuxfs3
- cflinuxfs4
- cflinuxfs5
51 changes: 0 additions & 51 deletions manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ dependencies:
cf_stacks:
- cflinuxfs4
- cflinuxfs5
- cflinuxfs3
source: https://github.com/rubygems/rubygems/tree/master/bundlertree/v2.6.5
source_sha256: 9d0eef5779ee569c43f317484f034081f58e9cf7529af6cd59d15266e46a72a3
- name: bundler
Expand All @@ -42,14 +41,6 @@ dependencies:
- cflinuxfs5
source: https://github.com/rubygems/rubygems/tree/master/bundlertree/v2.7.2
source_sha256: 1decaf9e2e1acb91b6586a2925c8f3f6da2334a82731a62ff2ded1b83c283871
- name: jruby
version: 9.4.8.0
uri: https://buildpacks.cloudfoundry.org/dependencies/jruby/jruby_9.4.8.0-ruby-3.1_linux_x64_cflinuxfs3_70896f95.tgz
sha256: 70896f95619b2244e68342aae3e596792bcd3d748333084640d1d7ea56cb1905
cf_stacks:
- cflinuxfs3
source: https://s3.amazonaws.com/jruby.org/downloads/9.4.8.0/jruby-src-9.4.8.0.tar.gz
source_sha256: d1a7abb31bd02335cf0e26e3de54e2f82232044c0b6e59bd336a00cab8e1e211
- name: jruby
version: 9.4.15.0
uri: https://buildpacks.cloudfoundry.org/dependencies/jruby/jruby_9.4.15.0-ruby-3.1_linux_x64_cflinuxfs4_39e32ac7.tgz
Expand All @@ -66,14 +57,6 @@ dependencies:
- cflinuxfs5
source: https://github.com/jruby/jruby/releases/download/9.4.15.0/jruby-src-9.4.15.0.zip
source_sha256: b7d3b5792c968fcb1b211bf759a82d857f26b671e3ff312b31af3a72c3ebce6c
- name: node
version: 20.16.0
uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_20.16.0_linux_x64_cflinuxfs3_62df07a7.tgz
sha256: 62df07a7204df3504e2e4c6fe422fbbde88625085a6df04c665660d49afd1c42
cf_stacks:
- cflinuxfs3
source: https://nodejs.org/dist/v20.16.0/node-v20.16.0.tar.gz
source_sha256: 8f24bf9abe455a09ab30f9ae8edda1e945ed678a4b1c3b07ee0f901fdc0ff4fd
- name: node
version: 24.22.1
uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_24.22.1_linux_x64_cflinuxfs4_e062d949.tgz
Expand Down Expand Up @@ -103,26 +86,9 @@ dependencies:
uri: https://java-buildpack.cloudfoundry.org/openjdk-jdk/bionic/x86_64/openjdk-jdk-1.8.0_242-bionic.tar.gz
sha256: dcb9fea2fc3a9b003031874ed17aa5d5a7ebbe397b276ecc8c814633003928fe
cf_stacks:
- cflinuxfs3
- cflinuxfs4
source: https://java-buildpack.cloudfoundry.org/openjdk-jdk/bionic/x86_64/openjdk-jdk-1.8.0_242-bionic.tar.gz
source_sha256: dcb9fea2fc3a9b003031874ed17aa5d5a7ebbe397b276ecc8c814633003928fe
- name: ruby
version: 3.3.8
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.3.8_linux_x64_cflinuxfs3_96ff3869.tgz
sha256: 96ff386969ded747bdfd9a8488fba229a43488c64249653fba4fa4fb078933b5
cf_stacks:
- cflinuxfs3
source: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.gz
source_sha256: 5ae28a87a59a3e4ad66bc2931d232dbab953d0aa8f6baf3bc4f8f80977c89cab
- name: ruby
version: 3.3.9
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.3.9_linux_x64_cflinuxfs3_8387680f.tgz
sha256: 8387680f143c7f7d037612fe52c46269c8ebf4af350c3c27c79496bc4b8d77d8
cf_stacks:
- cflinuxfs3
source: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.9.tar.gz
source_sha256: d1991690a4e17233ec6b3c7844c1e1245c0adce3e00d713551d0458467b727b1
- name: ruby
version: 3.3.11
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.3.11_linux_x64_cflinuxfs4_598ef388.tgz
Expand Down Expand Up @@ -155,22 +121,6 @@ dependencies:
- cflinuxfs5
source: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.13.tar.gz
source_sha256: 4cae72e971bd1cdb20ca87d299111182417c5276c162de8ead0ab0531426cd61
- name: ruby
version: 3.4.4
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.4.4_linux_x64_cflinuxfs3_5ba66089.tgz
sha256: 5ba660891dc3208b04e221bb78d8574690a7df930212f6ef8c3719c8196f6932
cf_stacks:
- cflinuxfs3
source: https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.gz
source_sha256: a0597bfdf312e010efd1effaa8d7f1d7833146fdc17950caa8158ffa3dcbfa85
- name: ruby
version: 3.4.7
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.4.7_linux_x64_cflinuxfs3_72757c9c.tgz
sha256: 72757c9c9fd8ada603b6f76a121052228e60b49f67205b5d4df2db12fc089f78
cf_stacks:
- cflinuxfs3
source: https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.7.tar.gz
source_sha256: 23815a6d095696f7919090fdc3e2f9459b2c83d57224b2e446ce1f5f7333ef36
- name: ruby
version: 3.4.7
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.4.7_linux_x64_cflinuxfs4_95d83a23.tgz
Expand Down Expand Up @@ -218,7 +168,6 @@ dependencies:
cf_stacks:
- cflinuxfs4
- cflinuxfs5
- cflinuxfs3
source: https://rubygems.org/rubygems/rubygems-3.6.8.tgz
source_sha256: da5340b42ba3ddc5ede4a6b948ffa5b409d48cb119e2937e27e4c0b13bf9c390
- name: yarn
Expand Down
8 changes: 1 addition & 7 deletions src/ruby/brats/brats_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,7 @@ var _ = Describe("Ruby buildpack", func() {
Expect(app.GetBody("/pg")).To(ContainSubstring("No such file or directory"))
})
By("supports mysql2", func() {
Expect(app.GetBody("/mysql2")).To(
Or(
// cflinuxfs3 and cflinuxfs4 have different libmysql versions, so diff msgs
ContainSubstring("Unknown MySQL server host 'testing'"),
ContainSubstring("Unknown server host 'testing'"),
),
)
Expect(app.GetBody("/mysql2")).To(ContainSubstring("Unknown server host 'testing'"))
})
})

Expand Down
2 changes: 1 addition & 1 deletion src/ruby/supply/supply.go
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ func (s *Supplier) InstallJVM() error {
return err
}
} else {
// Legacy naming used in cflinuxfs3/4: flat tarball, no strip needed.
// Legacy naming used in cflinuxfs4: flat tarball, no strip needed.
if err := s.Installer.InstallOnlyVersion("openjdk1.8-latest", jvmInstallDir); err != nil {
return err
}
Expand Down
Loading