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
6 changes: 6 additions & 0 deletions fixtures/default/relative_gemspec_path/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,9 @@ DEPENDENCIES
hola!
sinatra
webrick

RUBY VERSION
ruby 3.2.0p0

BUNDLED WITH
2.4.1
4 changes: 2 additions & 2 deletions fixtures/default/sinatra_jruby/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ DEPENDENCIES
webrick

RUBY VERSION
ruby 3.1.4p0 (jruby 9.4.3.0)
ruby 3.1.4p0 (jruby 9.4.8.0)

BUNDLED WITH
2.4.14
2.6.5
2 changes: 1 addition & 1 deletion fixtures/default/specified_ruby_version/Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'

ruby "~>3.1.0"
ruby "~>3.2.0"
gem "webrick"
gem 'sinatra'
28 changes: 19 additions & 9 deletions fixtures/default/specified_ruby_version/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
GEM
remote: https://rubygems.org/
specs:
rack (1.5.2)
rack-protection (1.5.2)
rack
sinatra (1.4.4)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
tilt (1.4.1)
webrick (1.7.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
rack (2.2.8)
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
ruby2_keywords (0.0.5)
sinatra (3.1.0)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
rack-protection (= 3.1.0)
tilt (~> 2.0)
tilt (2.3.0)
webrick (1.8.1)

PLATFORMS
ruby

DEPENDENCIES
sinatra
webrick

RUBY VERSION
ruby 3.2.0p0

BUNDLED WITH
2.4.1
6 changes: 4 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
module github.com/cloudfoundry/ruby-buildpack

go 1.22.5
go 1.23.0

toolchain go1.24.0

require (
github.com/blang/semver v3.5.1+incompatible
github.com/cloudfoundry/libbuildpack v0.0.0-20240717165421-f2ae8069fcba
github.com/cloudfoundry/switchblade v0.6.0
github.com/cloudfoundry/switchblade v0.9.0
github.com/golang/mock v1.6.0
github.com/kr/text v0.2.0
github.com/onsi/ginkgo v1.16.5
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,8 @@ github.com/cloudfoundry/libbuildpack v0.0.0-20240717165421-f2ae8069fcba h1:RdbOe
github.com/cloudfoundry/libbuildpack v0.0.0-20240717165421-f2ae8069fcba/go.mod h1:kn4FHMwI8bTd9gT92wPGjXHzUvGcj8CkPxG8q3AGBAQ=
github.com/cloudfoundry/switchblade v0.6.0 h1:Opid6YAp7a9+lzdvwlYIUUGnxV87QfCpizV+FYMt1MQ=
github.com/cloudfoundry/switchblade v0.6.0/go.mod h1:3nNqkW8dEecI9bxj8p1cHz3XG6AgPfp7jcmGHZYleos=
github.com/cloudfoundry/switchblade v0.9.0 h1:4yxlAb526G4XIDEoH9Vp+erCCYcXTD3aYaz5THKhskY=
github.com/cloudfoundry/switchblade v0.9.0/go.mod h1:lbxYZXU/aSVmEafP0NZgQaxrf9nBfdT8t2EIiwrP4bU=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
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 @@ -37,7 +37,7 @@ func testDefault(platform switchblade.Platform, fixtures string) func(*testing.T
Execute(name, filepath.Join(fixtures, "default", "specified_ruby_version"))
Expect(err).NotTo(HaveOccurred())

Eventually(deployment).Should(Serve(ContainSubstring("ruby 3.1.6")).WithEndpoint("/ruby"))
Eventually(deployment).Should(Serve(MatchRegexp(`ruby 3\.2\.\d+`)).WithEndpoint("/ruby"))
})
})

Expand Down
3 changes: 2 additions & 1 deletion src/ruby/integration/init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func TestIntegration(t *testing.T) {
var Expect = NewWithT(t).Expect

format.MaxLength = 0
SetDefaultEventuallyTimeout(10 * time.Second)
SetDefaultEventuallyTimeout(20 * time.Second)

root, err := filepath.Abs("./../../..")
Expect(err).NotTo(HaveOccurred())
Expand Down Expand Up @@ -98,6 +98,7 @@ func TestIntegration(t *testing.T) {
Expect(platform.Delete.Execute(proxyName)).To(Succeed())
Expect(os.Remove(os.Getenv("BUILDPACK_FILE"))).To(Succeed())
Expect(os.Remove(goBuildpackFile)).To(Succeed())
Expect(platform.Deinitialize()).To(Succeed())
}

func downloadBuildpack(name string) (string, error) {
Expand Down
18 changes: 14 additions & 4 deletions vendor/github.com/cloudfoundry/switchblade/cloudfoundry.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 14 additions & 6 deletions vendor/github.com/cloudfoundry/switchblade/docker.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading