From f8027e98fcb27cd431f1df34d383aaa646a5ad89 Mon Sep 17 00:00:00 2001 From: Schneems Date: Mon, 22 Apr 2024 11:41:09 -0500 Subject: [PATCH 1/2] Deprecate beta CNB support CNB support was introduced into this buildpack as an experiment. The experiment is over, anyone wanting to use the official CNB (still in "preview" support) should use https://github.com/heroku/buildpacks-ruby --- CHANGELOG.md | 1 + bin/build | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d957b0ef..c150d6481 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased] +- Deprecate CNB support, CNB users should use [heroku/buildpacks-ruby](https://github.com/heroku/buildpacks-ruby) instead (https://github.com/heroku/heroku-buildpack-ruby/pull/1445) ## [v268] - 2024-04-17 diff --git a/bin/build b/bin/build index 016645c90..d19b67ad2 100755 --- a/bin/build +++ b/bin/build @@ -8,10 +8,18 @@ APP_DIR=$(pwd) BIN_DIR=$(cd $(dirname $0); pwd) BUILDPACK_DIR=$(dirname $BIN_DIR) -# legacy buildpack uses $STACK +# legacy buildpack uses $STACK export STACK=$CNB_STACK_ID source "$BIN_DIR/support/bash_functions.sh" heroku_buildpack_ruby_install_ruby "$BIN_DIR" "$BUILDPACK_DIR" +cat<&2 + CNB no longer maintained + + The heroku/heroku-ruby-buildpack previously implemented the Cloud Native Buildpack \(CNB\) spec beta support, however this functionality is no longer supported or maintained. + + The Heroku Ruby CNB is now at https://github.com/heroku/buildpacks-ruby. See https://github.com/heroku/buildpacks for more information on using the Heroku CNB builder. To avoid interruptions switch to the new CNB as soon as possible. +EOF + $heroku_buildpack_ruby_dir/bin/ruby $BIN_DIR/support/ruby_build $APP_DIR $LAYERS_DIR $PLATFORM_DIR $PLAN From 36720a2028411c4a98d0c77530d147e29a23febb Mon Sep 17 00:00:00 2001 From: Richard Schneeman Date: Mon, 22 Apr 2024 12:22:13 -0500 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Josh W Lewis --- CHANGELOG.md | 2 +- bin/build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c150d6481..c82fb2871 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## [Unreleased] -- Deprecate CNB support, CNB users should use [heroku/buildpacks-ruby](https://github.com/heroku/buildpacks-ruby) instead (https://github.com/heroku/heroku-buildpack-ruby/pull/1445) +- Deprecate CNB support in this buildpack; CNB support for Ruby is provided by [heroku/buildpacks-ruby](https://github.com/heroku/buildpacks-ruby) instead (https://github.com/heroku/heroku-buildpack-ruby/pull/1445) ## [v268] - 2024-04-17 diff --git a/bin/build b/bin/build index d19b67ad2..16cecbdd7 100755 --- a/bin/build +++ b/bin/build @@ -15,7 +15,7 @@ source "$BIN_DIR/support/bash_functions.sh" heroku_buildpack_ruby_install_ruby "$BIN_DIR" "$BUILDPACK_DIR" cat<&2 - CNB no longer maintained + The CNB implementation in this buildpack is no longer maintained The heroku/heroku-ruby-buildpack previously implemented the Cloud Native Buildpack \(CNB\) spec beta support, however this functionality is no longer supported or maintained.