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/default/sinatra_jruby/Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '3.1.4', :engine => 'jruby', :engine_version => '9.4.8.0'
ruby '3.1.7', :engine => 'jruby', :engine_version => '9.4.14.0'

gem 'rackup'
gem 'sinatra'
Expand Down
6 changes: 4 additions & 2 deletions fixtures/default/sinatra_jruby/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,18 @@ GEM
webrick (1.9.2)

PLATFORMS
java
universal-java-1.8
universal-java-25
universal-java-8

DEPENDENCIES
rackup
sinatra
webrick

RUBY VERSION
ruby 3.1.4p0 (jruby 9.4.8.0)
ruby 3.1.7p0 (jruby 9.4.14.0)

BUNDLED WITH
2.3.26
2.6.3
12 changes: 5 additions & 7 deletions manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependency_deprecation_dates:
name: node
date: 2025-04-30
link: https://github.com/nodejs/Release

- version_line: 3.2.x
name: ruby
date: 2026-03-31
Expand Down Expand Up @@ -42,13 +41,13 @@ dependencies:
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.8.0
uri: https://buildpacks.cloudfoundry.org/dependencies/jruby/jruby_9.4.8.0-ruby-3.1_linux_x64_cflinuxfs4_89442854.tgz
sha256: 89442854db82ec0636e5f9c79a6c78a189222fbef8a68d7ce40c3afc82b99bd8
version: 9.4.14.0
uri: https://buildpacks.cloudfoundry.org/dependencies/jruby/jruby_9.4.14.0-ruby-3.1_linux_x64_cflinuxfs4_ab1682e2.tgz
sha256: ab1682e2022ce30ac0f768890349b467458d3b3e096bb3ac6756f68bd9cdaaaf
cf_stacks:
- cflinuxfs4
source: https://s3.amazonaws.com/jruby.org/downloads/9.4.8.0/jruby-src-9.4.8.0.tar.gz
source_sha256: d1a7abb31bd02335cf0e26e3de54e2f82232044c0b6e59bd336a00cab8e1e211
source: https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.4.14.0/jruby-dist-9.4.14.0-src.zip
source_sha256: 400086b33f701a47dc28c5965d5a408bc2740301a5fb3b545e37abaa002ccdf8
- name: node
version: 20.16.0
uri: https://buildpacks.cloudfoundry.org/dependencies/node/node_20.16.0_linux_x64_cflinuxfs3_62df07a7.tgz
Expand All @@ -74,7 +73,6 @@ dependencies:
- 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.2.8
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.2.8_linux_x64_cflinuxfs3_f36a7c8d.tgz
Expand Down
2 changes: 1 addition & 1 deletion src/ruby/integration/default_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T
Expect(logs).To(ContainLines(MatchRegexp(`Installing jruby \d+\.\d+\.\d+\.\d+`)))
// JRuby needs extra time to warm up after health check passes
// Increase timeout to 3 minutes with 2-second intervals for CI environments
Eventually(deployment, 3*time.Minute, 2*time.Second).Should(Serve(ContainSubstring("jruby 3.1.4")).WithEndpoint("/ruby"), logs.String())
Eventually(deployment, 3*time.Minute, 2*time.Second).Should(Serve(ContainSubstring("jruby 3.1.7")).WithEndpoint("/ruby"), logs.String())
})
})
}
Expand Down
Loading