Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update heroku/buildpacks-ruby to v3.0.0 and add to builder-24 #521

Merged
merged 2 commits into from
May 20, 2024
Merged

Update heroku/buildpacks-ruby to v3.0.0 and add to builder-24 #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bd8ad2
Update heroku/buildpacks-ruby to v3.0.0
heroku-linguist[bot] May 20, 2024
70aed6a
Add Ruby to heroku/builder:24
edmorley May 20, 2024
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 .github/workflows/build-test-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ jobs:
- builder: builder-24
language: node-js
arch: arm64
- builder: builder-24
language: ruby
arch: amd64
- builder: builder-24
language: ruby
arch: arm64
steps:
# Checkout is needed only for the setup_docker_ci script
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions builder-20/builder.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ version = "0.19.6"

[[buildpacks]]
id = "heroku/ruby"
uri = "docker://docker.io/heroku/buildpack-ruby@sha256:995e2898a7a7fe1cb38ac24263d2f7d3fba1051ce170033320116a8aa81f9b21"
uri = "docker://docker.io/heroku/buildpack-ruby@sha256:b98b873adf2fc51dce9ae09331486cfe2f799ec233eb7128d1f5068e6e63e25a"

[[buildpacks]]
id = "heroku/scala"
Expand Down Expand Up @@ -64,7 +64,7 @@ version = "0.19.6"
optional = true
[[order.group]]
id = "heroku/ruby"
version = "2.1.3"
version = "3.0.0"
[[order.group]]
id = "heroku/procfile"
version = "3.1.1"
Expand Down
4 changes: 2 additions & 2 deletions builder-22/builder.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ version = "0.19.6"

[[buildpacks]]
id = "heroku/ruby"
uri = "docker://docker.io/heroku/buildpack-ruby@sha256:995e2898a7a7fe1cb38ac24263d2f7d3fba1051ce170033320116a8aa81f9b21"
uri = "docker://docker.io/heroku/buildpack-ruby@sha256:b98b873adf2fc51dce9ae09331486cfe2f799ec233eb7128d1f5068e6e63e25a"

[[buildpacks]]
id = "heroku/scala"
Expand Down Expand Up @@ -64,7 +64,7 @@ version = "0.19.6"
optional = true
[[order.group]]
id = "heroku/ruby"
version = "2.1.3"
version = "3.0.0"
[[order.group]]
id = "heroku/procfile"
version = "3.1.1"
Expand Down
26 changes: 26 additions & 0 deletions builder-24/builder.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ version = "0.19.6"
id = "heroku/python"
uri = "docker://docker.io/heroku/buildpack-python@sha256:a64c75016e01aced71f98262eba7cdd132170f43df5281c94d624cbb1d230da2"

[[buildpacks]]
id = "heroku/ruby"
uri = "docker://docker.io/heroku/buildpack-ruby@sha256:b98b873adf2fc51dce9ae09331486cfe2f799ec233eb7128d1f5068e6e63e25a"

[[order]]
[[order.group]]
id = "heroku/python"
Expand All @@ -33,6 +37,28 @@ version = "0.19.6"
version = "3.1.1"
optional = true

[[order]]
[[order.group]]
id = "heroku/nodejs-engine"
version = "3.2.1"
optional = true
[[order.group]]
id = "heroku/nodejs-yarn"
version = "3.2.1"
optional = true
# TODO: Enable once `heroku/jvm` supports Heroku-24.
# [[order.group]]
# id = "heroku/jvm"
# version = "TBD"
# optional = true
Comment on lines +49 to +53
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi @schneems @Malax I've had to comment out the optional heroku/jvm entry in the Ruby detection group for now, since heroku/jvm doesn't yet support Heroku-24. Once it does, this can be uncommented as part of adding the JVM CNBs to this builder.

[[order.group]]
id = "heroku/ruby"
version = "3.0.0"
[[order.group]]
id = "heroku/procfile"
version = "3.1.1"
optional = true

[[order]]
[[order.group]]
id = "heroku/nodejs"
Expand Down