From 9dc8ea4a775bbf7da5a3ad08903e41e25bee0ee0 Mon Sep 17 00:00:00 2001 From: Matt Larraz Date: Wed, 6 Dec 2023 05:50:36 -0500 Subject: [PATCH 1/3] Allow custom vendored Ruby URL (#1406) * Allow custom vendored Ruby URL Lets us provide our own custom set of vendored Ruby runtimes. Currently in use on our fork of this repo, but we'd like to merge it upstream. Fixes #1164. * Changelog * Correct changelog PR URL --------- Co-authored-by: Schneems Co-authored-by: Ed Morley <501702+edmorley@users.noreply.github.com> --- CHANGELOG.md | 2 ++ bin/support/download_ruby | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e79994251..0cfed7906 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Main (unreleased) +- Fix BUILDPACK_VENDOR_URL support (https://github.com/heroku/heroku-buildpack-ruby/pull/1406) + ## v262 (2023/11/08) - Warn when relying on default Node.js or Yarn versions (https://github.com/heroku/heroku-buildpack-ruby/pull/1401) diff --git a/bin/support/download_ruby b/bin/support/download_ruby index 37737ba8d..d3087b175 100755 --- a/bin/support/download_ruby +++ b/bin/support/download_ruby @@ -26,7 +26,7 @@ curl_retry_on_18() { regex=".*ruby_version = [\'\"]([0-9]+\.[0-9]+\.[0-9]+)[\'\"].*" if [[ $(cat "$BIN_DIR/../buildpack.toml") =~ $regex ]] then - heroku_buildpack_ruby_url="https://heroku-buildpack-ruby.s3.us-east-1.amazonaws.com/$STACK/ruby-${BASH_REMATCH[1]}.tgz" + heroku_buildpack_ruby_url="${BUILDPACK_VENDOR_URL:-https://heroku-buildpack-ruby.s3.us-east-1.amazonaws.com}/$STACK/ruby-${BASH_REMATCH[1]}.tgz" else echo "Could not detect ruby version to bootstrap" exit 1 From 453b13983b638d68d9d65ab89d36a2fc18128e4a Mon Sep 17 00:00:00 2001 From: Richard Schneeman Date: Mon, 11 Dec 2023 10:33:20 -0600 Subject: [PATCH 2/3] v263 (#1411) - Release 3.3.0-rc1 - Release the BUILDPACK_VENDOR_URL fix GUS-W-14644302 --- CHANGELOG.md | 3 +++ changelogs/v263/ruby-330-rc1.md | 15 +++++++++++++++ lib/language_pack/version.rb | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 changelogs/v263/ruby-330-rc1.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cfed7906..ff18d7c02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Main (unreleased) +## v263 (2023/12/11) + +- Ruby 3.3.0-rc1 is now available (https://github.com/heroku/heroku-buildpack-ruby/pull/1411) - Fix BUILDPACK_VENDOR_URL support (https://github.com/heroku/heroku-buildpack-ruby/pull/1406) ## v262 (2023/11/08) diff --git a/changelogs/v263/ruby-330-rc1.md b/changelogs/v263/ruby-330-rc1.md new file mode 100644 index 000000000..56e74afe3 --- /dev/null +++ b/changelogs/v263/ruby-330-rc1.md @@ -0,0 +1,15 @@ +## Ruby version 3.3.0-rc1 is now available + +[Ruby v3.3.0-rc1](/articles/ruby-support#ruby-versions) is now available on Heroku. To run +your app using this version of Ruby, add the following `ruby` directive to your Gemfile: + +```ruby +ruby "3.3.0.rc1" +``` + +For more information on [Ruby 3.3.0-rc1, you can view the release announcement](https://www.ruby-lang.org/en/news/). + +Note: This version of Ruby is not suitable for production applications. + However, it can be used to test that your application is ready for + the official release of Ruby 3.3.0 and + to provide feedback to the Ruby core team. diff --git a/lib/language_pack/version.rb b/lib/language_pack/version.rb index 98fef1a97..ba1f83000 100644 --- a/lib/language_pack/version.rb +++ b/lib/language_pack/version.rb @@ -2,6 +2,6 @@ module LanguagePack class LanguagePack::Base - BUILDPACK_VERSION = "v262" + BUILDPACK_VERSION = "v263" end end From 8d2f6ca8d73e335cce34781935c095311f0737a1 Mon Sep 17 00:00:00 2001 From: Richard Schneeman Date: Mon, 25 Dec 2023 09:12:21 -0600 Subject: [PATCH 3/3] Ruby 3.3.0 release prep for Christmas (#1412) --- CHANGELOG.md | 4 ++++ lib/language_pack/version.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff18d7c02..12140ce64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Main (unreleased) +## v264 (2023/12/25) + +- Ruby 3.3.0 is now available + ## v263 (2023/12/11) - Ruby 3.3.0-rc1 is now available (https://github.com/heroku/heroku-buildpack-ruby/pull/1411) diff --git a/lib/language_pack/version.rb b/lib/language_pack/version.rb index ba1f83000..d58bf44db 100644 --- a/lib/language_pack/version.rb +++ b/lib/language_pack/version.rb @@ -2,6 +2,6 @@ module LanguagePack class LanguagePack::Base - BUILDPACK_VERSION = "v263" + BUILDPACK_VERSION = "v264" end end