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 .github/workflows/dependency-deprecation-reminder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
with:
ref: develop
ref: master

- name: Get deprecations
id: deprecations
Expand Down
101 changes: 0 additions & 101 deletions .github/workflows/release-reminder.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/synchronize-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Synchronize Labels
on:
push:
branches:
- develop
- master
paths:
- .github/labels.yml
workflow_dispatch: {}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test Pull Request
on:
pull_request:
branches:
- develop
- master

jobs:
unit:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-github-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v4
with:
token: ${{ secrets.CF_BOT_GITHUB_TOKEN }}
ref: develop
ref: master

- name: Checkout github-config
uses: actions/checkout@v4
Expand Down Expand Up @@ -61,4 +61,4 @@ jobs:
token: ${{ secrets.CF_BOT_GITHUB_TOKEN }}
title: "Updates github-config"
branch: automation/github-config/update
base: develop
base: master
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ See the [Machete](https://github.com/cf-buildpacks/machete) CF buildpack test fr

Please include integration tests (in `cf_spec/integration`) and corresponding fixtures (in `cf_spec/fixtures`) where necessary to cover any functionality that is introduced.

**NOTE:** When submitting a pull request, *please make sure to target the `develop` branch*, so that your changes are up-to-date and easy to integrate with the most recent work on the buildpack. Thanks!
**NOTE:** When submitting a pull request, *please make sure to target the `master` branch*, so that your changes are up-to-date and easy to integrate with the most recent work on the buildpack. Thanks!
2 changes: 1 addition & 1 deletion PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ Thanks for contributing to the buildpack. To speed up the process of reviewing y

* [ ] I have viewed signed and have submitted the Contributor License Agreement

* [ ] I have made this pull request to the `develop` branch
* [ ] I have made this pull request to the `master` branch

* [ ] I have added an integration test
98 changes: 57 additions & 41 deletions manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,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.1.5
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.1.5_linux_x64_cflinuxfs3_81a76f9a.tgz
sha256: 81a76f9a0d5e2690e279a9510b602a63e78424b34193b62395eb9ebaef95798e
cf_stacks:
- cflinuxfs3
source: https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.gz
source_sha256: 3685c51eeee1352c31ea039706d71976f53d00ab6d77312de6aa1abaf5cda2c5
- name: ruby
version: 3.1.5
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.1.5_linux_x64_cflinuxfs4_a82a21cb.tgz
sha256: a82a21cb383081d4000fbf0c09728f1acaa386b941dd3bbe2213209dce02d96d
cf_stacks:
- cflinuxfs4
source: https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.5.tar.gz
source_sha256: 3685c51eeee1352c31ea039706d71976f53d00ab6d77312de6aa1abaf5cda2c5
- name: ruby
version: 3.1.6
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.1.6_linux_x64_cflinuxfs3_ae207103.tgz
Expand All @@ -110,21 +94,21 @@ dependencies:
source: https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.gz
source_sha256: 0d0dafb859e76763432571a3109d1537d976266be3083445651dc68deed25c22
- name: ruby
version: 3.2.5
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.2.5_linux_x64_cflinuxfs3_a0d3683e.tgz
sha256: a0d3683e167804d836859c53eb8b7f31ba8fd70e23d0be45eaf0e2d5f0999def
version: 3.1.7
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.1.7_linux_x64_cflinuxfs3_82a2667b.tgz
sha256: 82a2667bbafcc8af14782b2be1b8c9d77085bc052324db10f789b82f369002b2
cf_stacks:
- cflinuxfs3
source: https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.gz
source_sha256: ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16
source: https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.gz
source_sha256: 0556acd69f141ddace03fa5dd8d76e7ea0d8f5232edf012429579bcdaab30e7b
- name: ruby
version: 3.2.5
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.2.5_linux_x64_cflinuxfs4_7cb2e65f.tgz
sha256: 7cb2e65ff32f8aa1406768e362ceec26be1998d94aca06a792e1fe562eca6351
version: 3.1.7
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.1.7_linux_x64_cflinuxfs4_c92cfbfd.tgz
sha256: c92cfbfdcaa71328e09602cf20eb95233ebab88b4b06f14c0642f719c36e66d2
cf_stacks:
- cflinuxfs4
source: https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.5.tar.gz
source_sha256: ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16
source: https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.7.tar.gz
source_sha256: 0556acd69f141ddace03fa5dd8d76e7ea0d8f5232edf012429579bcdaab30e7b
- name: ruby
version: 3.2.7
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.2.7_linux_x64_cflinuxfs3_29a8cff1.tgz
Expand All @@ -142,21 +126,21 @@ dependencies:
source: https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.7.tar.gz
source_sha256: 8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741
- name: ruby
version: 3.3.6
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.3.6_linux_x64_cflinuxfs3_8c2f2443.tgz
sha256: 8c2f2443a1afb6522a1f3d5829eddaa70482b286519ac836a37aa31efb6d157e
version: 3.2.8
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.2.8_linux_x64_cflinuxfs3_f36a7c8d.tgz
sha256: f36a7c8d727664a7f4dd01911aaa1d5aa19f55f6d4612e4511d5415a5727d45c
cf_stacks:
- cflinuxfs3
source: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.gz
source_sha256: 8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d
source: https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.gz
source_sha256: 77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075
- name: ruby
version: 3.3.6
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.3.6_linux_x64_cflinuxfs4_e4311262.tgz
sha256: e4311262803d0e1a01c83001e3e98ad58700b5cc36eff12433f24312b11e3dc9
version: 3.2.8
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.2.8_linux_x64_cflinuxfs4_18ec473d.tgz
sha256: 18ec473db6dc4c37e89fe220623c544ba9b66abca5740481ae8ac8fefa503e95
cf_stacks:
- cflinuxfs4
source: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.gz
source_sha256: 8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d
source: https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.8.tar.gz
source_sha256: 77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075
- name: ruby
version: 3.3.7
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.3.7_linux_x64_cflinuxfs3_67267b5a.tgz
Expand All @@ -173,6 +157,22 @@ dependencies:
- cflinuxfs4
source: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.7.tar.gz
source_sha256: 9c37c3b12288c7aec20ca121ce76845be5bb5d77662a24919651aaf1d12c8628
- 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.8
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.3.8_linux_x64_cflinuxfs4_a1517fae.tgz
sha256: a1517fae55b33e1b138064aea5bafc0417a8cd76029fb0cca3e7b0ab2ed2d016
cf_stacks:
- cflinuxfs4
source: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.gz
source_sha256: 5ae28a87a59a3e4ad66bc2931d232dbab953d0aa8f6baf3bc4f8f80977c89cab
- name: ruby
version: 3.4.2
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.4.2_linux_x64_cflinuxfs3_d4d30e0f.tgz
Expand All @@ -189,15 +189,31 @@ dependencies:
- cflinuxfs4
source: https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.2.tar.gz
source_sha256: 41328ac21f2bfdd7de6b3565ef4f0dd7543354d37e96f157a1552a6bd0eb364b
- 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.4
uri: https://buildpacks.cloudfoundry.org/dependencies/ruby/ruby_3.4.4_linux_x64_cflinuxfs4_5f8c8f1e.tgz
sha256: 5f8c8f1ec5527297a1649da993059b18f5b914f3f28afdde075f1110ce273c1d
cf_stacks:
- cflinuxfs4
source: https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.4.tar.gz
source_sha256: a0597bfdf312e010efd1effaa8d7f1d7833146fdc17950caa8158ffa3dcbfa85
- name: rubygems
version: 3.6.6
uri: https://buildpacks.cloudfoundry.org/dependencies/rubygems/rubygems_3.6.6_linux_noarch_any-stack_69f7e96e.tgz
sha256: 69f7e96ef27ca350c13b9711be0a1f10807fbafe85515ab377c86f83fcd4c6df
version: 3.6.8
uri: https://buildpacks.cloudfoundry.org/dependencies/rubygems/rubygems_3.6.8_linux_noarch_any-stack_7a02eb5e.tgz
sha256: 7a02eb5e5cf4ed6ad6a4245babf69f1f4c6acc1cbdf6d126dee8bf73dca7f8de
cf_stacks:
- cflinuxfs4
- cflinuxfs3
source: https://rubygems.org/rubygems/rubygems-3.6.6.tgz
source_sha256: b4642fe16598fb93d40d6bcde9f69250debc0f13238cad410a7505c0cf740dad
source: https://rubygems.org/rubygems/rubygems-3.6.8.tgz
source_sha256: da5340b42ba3ddc5ede4a6b948ffa5b409d48cb119e2937e27e4c0b13bf9c390
- name: yarn
version: 1.22.22
uri: https://buildpacks.cloudfoundry.org/dependencies/yarn/yarn_1.22.22_linux_noarch_any-stack_83bda680.tgz
Expand Down
2 changes: 1 addition & 1 deletion src/ruby/integration/multibuildpack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func testMultiBuildpack(platform switchblade.Platform, fixtures string) func(*te
Expect(err).NotTo(HaveOccurred())

Eventually(deployment).Should(Serve(ContainSubstring("Ruby version: ruby 3.")))
Eventually(deployment).Should(Serve(ContainSubstring("Node version: v18.")))
Eventually(deployment).Should(Serve(MatchRegexp(`Node version: v\d+\.\d+\.\d+`)))
})
})

Expand Down
Loading