From b2974f89ffd65aa3b2bb62bc8f616f6ebc91e9cd Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 19 Dec 2024 17:35:59 +0100 Subject: [PATCH 1/9] Update a DC article link in changelog generator Build behavior is now in a separate article. --- support/devcenter/changelog.twig | 2 +- test/fixtures/devcenter/changelog/changelog.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/support/devcenter/changelog.twig b/support/devcenter/changelog.twig index 2adb63140..266a7ce78 100644 --- a/support/devcenter/changelog.twig +++ b/support/devcenter/changelog.twig @@ -23,7 +23,7 @@ The following [PHP extensions](https://devcenter.heroku.com/articles/php-support {% endif -%} {% if composers %} -The following new [Composer versions](https://devcenter.heroku.com/articles/php-support#available-composer-versions) are now available [for use during builds](https://devcenter.heroku.com/articles/php-support#installation-of-dependencies): +The following new [Composer versions](https://devcenter.heroku.com/articles/php-support#available-composer-versions) are now available [for use during builds](https://devcenter.heroku.com/articles/heroku-php-behavior#installation-of-dependencies): {% for composer in composers %} - [Composer {{composer.version}}]({{composer.link|raw}}) diff --git a/test/fixtures/devcenter/changelog/changelog.md b/test/fixtures/devcenter/changelog/changelog.md index 2d092363e..20e396df1 100644 --- a/test/fixtures/devcenter/changelog/changelog.md +++ b/test/fixtures/devcenter/changelog/changelog.md @@ -14,7 +14,7 @@ The following [PHP extensions](https://devcenter.heroku.com/articles/php-support - [`ext-newrelic` 11.0.0.13](https://docs.newrelic.com/docs/release-notes/agent-release-notes/php-release-notes/php-agent-11-0-0-13/) - [`ext-phalcon` 5.6.0](https://pecl.php.net/package-changelog.php?package=phalcon&release=5.6.0) -The following new [Composer versions](https://devcenter.heroku.com/articles/php-support#available-composer-versions) are now available [for use during builds](https://devcenter.heroku.com/articles/php-support#installation-of-dependencies): +The following new [Composer versions](https://devcenter.heroku.com/articles/php-support#available-composer-versions) are now available [for use during builds](https://devcenter.heroku.com/articles/heroku-php-behavior#installation-of-dependencies): - [Composer 2.8.0](https://getcomposer.org/changelog/2.8.0) From 8db4318b863977f9dc5ee6ea2f115f559e9b8cb5 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 19 Dec 2024 17:43:38 +0100 Subject: [PATCH 2/9] PHP/8.2.27 GUS-W-16223631 --- CHANGELOG.md | 3 +++ support/build/{php-8.2.26 => php-8.2.27} | 0 2 files changed, 3 insertions(+) rename support/build/{php-8.2.26 => php-8.2.27} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8d073c85..3012c8500 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## [Unreleased] +### ADD + +- PHP/8.2.27 [David Zuelke] ## [v260] - 2024-12-19 diff --git a/support/build/php-8.2.26 b/support/build/php-8.2.27 similarity index 100% rename from support/build/php-8.2.26 rename to support/build/php-8.2.27 From 7d89448e6b75e4347d8eaa6d8c5f46af440fae9a Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 19 Dec 2024 17:48:26 +0100 Subject: [PATCH 3/9] PHP/8.3.15 GUS-W-16223631 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/{php-8.3.14 => php-8.3.15} | 0 support/build/{php-min-8.3.14 => php-min-8.3.15} | 0 4 files changed, 2 insertions(+), 1 deletion(-) rename support/build/{php-8.3.14 => php-8.3.15} (100%) rename support/build/{php-min-8.3.14 => php-min-8.3.15} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3012c8500..69ee0b69c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### ADD - PHP/8.2.27 [David Zuelke] +- PHP/8.3.15 [David Zuelke] ## [v260] - 2024-12-19 diff --git a/bin/compile b/bin/compile index 18e7e41fb..ec348a7c6 100755 --- a/bin/compile +++ b/bin/compile @@ -250,7 +250,7 @@ fi mkdir -p $build_dir/.heroku/php-min ln -s $build_dir/.heroku/php-min /app/.heroku/php-min -curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 10 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-8.3.14.tar.gz" || { +curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 10 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-8.3.15.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! diff --git a/support/build/php-8.3.14 b/support/build/php-8.3.15 similarity index 100% rename from support/build/php-8.3.14 rename to support/build/php-8.3.15 diff --git a/support/build/php-min-8.3.14 b/support/build/php-min-8.3.15 similarity index 100% rename from support/build/php-min-8.3.14 rename to support/build/php-min-8.3.15 From a7f2fc1fbd5dc8ca47b1ccf9a31848b9e2b7ac15 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 19 Dec 2024 17:48:46 +0100 Subject: [PATCH 4/9] PHP/8.4.2 GUS-W-16223631 --- CHANGELOG.md | 1 + support/build/{php-8.4.1 => php-8.4.2} | 0 2 files changed, 1 insertion(+) rename support/build/{php-8.4.1 => php-8.4.2} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69ee0b69c..2981fd65b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/8.2.27 [David Zuelke] - PHP/8.3.15 [David Zuelke] +- PHP/8.4.2 [David Zuelke] ## [v260] - 2024-12-19 diff --git a/support/build/php-8.4.1 b/support/build/php-8.4.2 similarity index 100% rename from support/build/php-8.4.1 rename to support/build/php-8.4.2 From 0868f63d1961732e6d1486c1ea44811b561ff6b3 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 19 Dec 2024 18:24:46 +0100 Subject: [PATCH 5/9] ext-mongodb/1.20.1 GUS-W-16223632 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20190902/{mongodb-1.20.0 => mongodb-1.20.1} | 0 .../no-debug-non-zts-20200930/{mongodb-1.20.0 => mongodb-1.20.1} | 0 .../no-debug-non-zts-20210902/{mongodb-1.20.0 => mongodb-1.20.1} | 0 .../no-debug-non-zts-20220829/{mongodb-1.20.0 => mongodb-1.20.1} | 0 .../no-debug-non-zts-20230831/{mongodb-1.20.0 => mongodb-1.20.1} | 0 .../no-debug-non-zts-20240924/{mongodb-1.20.0 => mongodb-1.20.1} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20190902/{mongodb-1.20.0 => mongodb-1.20.1} (100%) rename support/build/extensions/no-debug-non-zts-20200930/{mongodb-1.20.0 => mongodb-1.20.1} (100%) rename support/build/extensions/no-debug-non-zts-20210902/{mongodb-1.20.0 => mongodb-1.20.1} (100%) rename support/build/extensions/no-debug-non-zts-20220829/{mongodb-1.20.0 => mongodb-1.20.1} (100%) rename support/build/extensions/no-debug-non-zts-20230831/{mongodb-1.20.0 => mongodb-1.20.1} (100%) rename support/build/extensions/no-debug-non-zts-20240924/{mongodb-1.20.0 => mongodb-1.20.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2981fd65b..9ff3c9dc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - PHP/8.2.27 [David Zuelke] - PHP/8.3.15 [David Zuelke] - PHP/8.4.2 [David Zuelke] +- ext-mongodb/1.20.1 [David Zuelke] ## [v260] - 2024-12-19 diff --git a/support/build/extensions/no-debug-non-zts-20190902/mongodb-1.20.0 b/support/build/extensions/no-debug-non-zts-20190902/mongodb-1.20.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20190902/mongodb-1.20.0 rename to support/build/extensions/no-debug-non-zts-20190902/mongodb-1.20.1 diff --git a/support/build/extensions/no-debug-non-zts-20200930/mongodb-1.20.0 b/support/build/extensions/no-debug-non-zts-20200930/mongodb-1.20.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20200930/mongodb-1.20.0 rename to support/build/extensions/no-debug-non-zts-20200930/mongodb-1.20.1 diff --git a/support/build/extensions/no-debug-non-zts-20210902/mongodb-1.20.0 b/support/build/extensions/no-debug-non-zts-20210902/mongodb-1.20.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20210902/mongodb-1.20.0 rename to support/build/extensions/no-debug-non-zts-20210902/mongodb-1.20.1 diff --git a/support/build/extensions/no-debug-non-zts-20220829/mongodb-1.20.0 b/support/build/extensions/no-debug-non-zts-20220829/mongodb-1.20.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20220829/mongodb-1.20.0 rename to support/build/extensions/no-debug-non-zts-20220829/mongodb-1.20.1 diff --git a/support/build/extensions/no-debug-non-zts-20230831/mongodb-1.20.0 b/support/build/extensions/no-debug-non-zts-20230831/mongodb-1.20.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20230831/mongodb-1.20.0 rename to support/build/extensions/no-debug-non-zts-20230831/mongodb-1.20.1 diff --git a/support/build/extensions/no-debug-non-zts-20240924/mongodb-1.20.0 b/support/build/extensions/no-debug-non-zts-20240924/mongodb-1.20.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20240924/mongodb-1.20.0 rename to support/build/extensions/no-debug-non-zts-20240924/mongodb-1.20.1 From 2d5ada36dabe5fbd6769cc6045a8cd92f2c13521 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 19 Dec 2024 18:26:13 +0100 Subject: [PATCH 6/9] ext-newrelic/11.4.0.17 GUS-W-16223632 --- CHANGELOG.md | 1 + .../{newrelic-11.3.0.16 => newrelic-11.4.0.17} | 0 .../{newrelic-11.3.0.16 => newrelic-11.4.0.17} | 0 .../{newrelic-11.3.0.16 => newrelic-11.4.0.17} | 0 .../{newrelic-11.3.0.16 => newrelic-11.4.0.17} | 0 .../{newrelic-11.3.0.16 => newrelic-11.4.0.17} | 0 .../{newrelic-11.3.0.16 => newrelic-11.4.0.17} | 0 7 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20180731/{newrelic-11.3.0.16 => newrelic-11.4.0.17} (100%) rename support/build/extensions/no-debug-non-zts-20190902/{newrelic-11.3.0.16 => newrelic-11.4.0.17} (100%) rename support/build/extensions/no-debug-non-zts-20200930/{newrelic-11.3.0.16 => newrelic-11.4.0.17} (100%) rename support/build/extensions/no-debug-non-zts-20210902/{newrelic-11.3.0.16 => newrelic-11.4.0.17} (100%) rename support/build/extensions/no-debug-non-zts-20220829/{newrelic-11.3.0.16 => newrelic-11.4.0.17} (100%) rename support/build/extensions/no-debug-non-zts-20230831/{newrelic-11.3.0.16 => newrelic-11.4.0.17} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ff3c9dc4..d1b55f58c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - PHP/8.3.15 [David Zuelke] - PHP/8.4.2 [David Zuelke] - ext-mongodb/1.20.1 [David Zuelke] +- ext-newrelic/11.4.0.17 [David Zuelke] ## [v260] - 2024-12-19 diff --git a/support/build/extensions/no-debug-non-zts-20180731/newrelic-11.3.0.16 b/support/build/extensions/no-debug-non-zts-20180731/newrelic-11.4.0.17 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/newrelic-11.3.0.16 rename to support/build/extensions/no-debug-non-zts-20180731/newrelic-11.4.0.17 diff --git a/support/build/extensions/no-debug-non-zts-20190902/newrelic-11.3.0.16 b/support/build/extensions/no-debug-non-zts-20190902/newrelic-11.4.0.17 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20190902/newrelic-11.3.0.16 rename to support/build/extensions/no-debug-non-zts-20190902/newrelic-11.4.0.17 diff --git a/support/build/extensions/no-debug-non-zts-20200930/newrelic-11.3.0.16 b/support/build/extensions/no-debug-non-zts-20200930/newrelic-11.4.0.17 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20200930/newrelic-11.3.0.16 rename to support/build/extensions/no-debug-non-zts-20200930/newrelic-11.4.0.17 diff --git a/support/build/extensions/no-debug-non-zts-20210902/newrelic-11.3.0.16 b/support/build/extensions/no-debug-non-zts-20210902/newrelic-11.4.0.17 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20210902/newrelic-11.3.0.16 rename to support/build/extensions/no-debug-non-zts-20210902/newrelic-11.4.0.17 diff --git a/support/build/extensions/no-debug-non-zts-20220829/newrelic-11.3.0.16 b/support/build/extensions/no-debug-non-zts-20220829/newrelic-11.4.0.17 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20220829/newrelic-11.3.0.16 rename to support/build/extensions/no-debug-non-zts-20220829/newrelic-11.4.0.17 diff --git a/support/build/extensions/no-debug-non-zts-20230831/newrelic-11.3.0.16 b/support/build/extensions/no-debug-non-zts-20230831/newrelic-11.4.0.17 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20230831/newrelic-11.3.0.16 rename to support/build/extensions/no-debug-non-zts-20230831/newrelic-11.4.0.17 From 948dae5d412bb37de26008dab52f2d45bc529f93 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 19 Dec 2024 18:27:33 +0100 Subject: [PATCH 7/9] ext-blackfire/1.92.30 GUS-W-16223632 --- CHANGELOG.md | 1 + .../{blackfire-1.92.29 => blackfire-1.92.30} | 0 .../{blackfire-1.92.29 => blackfire-1.92.30} | 0 .../{blackfire-1.92.29 => blackfire-1.92.30} | 0 .../{blackfire-1.92.29 => blackfire-1.92.30} | 0 .../{blackfire-1.92.29 => blackfire-1.92.30} | 0 .../{blackfire-1.92.29 => blackfire-1.92.30} | 0 .../{blackfire-1.92.29 => blackfire-1.92.30} | 0 8 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20180731/{blackfire-1.92.29 => blackfire-1.92.30} (100%) rename support/build/extensions/no-debug-non-zts-20190902/{blackfire-1.92.29 => blackfire-1.92.30} (100%) rename support/build/extensions/no-debug-non-zts-20200930/{blackfire-1.92.29 => blackfire-1.92.30} (100%) rename support/build/extensions/no-debug-non-zts-20210902/{blackfire-1.92.29 => blackfire-1.92.30} (100%) rename support/build/extensions/no-debug-non-zts-20220829/{blackfire-1.92.29 => blackfire-1.92.30} (100%) rename support/build/extensions/no-debug-non-zts-20230831/{blackfire-1.92.29 => blackfire-1.92.30} (100%) rename support/build/extensions/no-debug-non-zts-20240924/{blackfire-1.92.29 => blackfire-1.92.30} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1b55f58c..2f4cfbadd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - PHP/8.4.2 [David Zuelke] - ext-mongodb/1.20.1 [David Zuelke] - ext-newrelic/11.4.0.17 [David Zuelke] +- ext-blackfire/1.92.30 [David Zuelke] ## [v260] - 2024-12-19 diff --git a/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.92.29 b/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.92.30 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/blackfire-1.92.29 rename to support/build/extensions/no-debug-non-zts-20180731/blackfire-1.92.30 diff --git a/support/build/extensions/no-debug-non-zts-20190902/blackfire-1.92.29 b/support/build/extensions/no-debug-non-zts-20190902/blackfire-1.92.30 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20190902/blackfire-1.92.29 rename to support/build/extensions/no-debug-non-zts-20190902/blackfire-1.92.30 diff --git a/support/build/extensions/no-debug-non-zts-20200930/blackfire-1.92.29 b/support/build/extensions/no-debug-non-zts-20200930/blackfire-1.92.30 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20200930/blackfire-1.92.29 rename to support/build/extensions/no-debug-non-zts-20200930/blackfire-1.92.30 diff --git a/support/build/extensions/no-debug-non-zts-20210902/blackfire-1.92.29 b/support/build/extensions/no-debug-non-zts-20210902/blackfire-1.92.30 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20210902/blackfire-1.92.29 rename to support/build/extensions/no-debug-non-zts-20210902/blackfire-1.92.30 diff --git a/support/build/extensions/no-debug-non-zts-20220829/blackfire-1.92.29 b/support/build/extensions/no-debug-non-zts-20220829/blackfire-1.92.30 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20220829/blackfire-1.92.29 rename to support/build/extensions/no-debug-non-zts-20220829/blackfire-1.92.30 diff --git a/support/build/extensions/no-debug-non-zts-20230831/blackfire-1.92.29 b/support/build/extensions/no-debug-non-zts-20230831/blackfire-1.92.30 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20230831/blackfire-1.92.29 rename to support/build/extensions/no-debug-non-zts-20230831/blackfire-1.92.30 diff --git a/support/build/extensions/no-debug-non-zts-20240924/blackfire-1.92.29 b/support/build/extensions/no-debug-non-zts-20240924/blackfire-1.92.30 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20240924/blackfire-1.92.29 rename to support/build/extensions/no-debug-non-zts-20240924/blackfire-1.92.30 From 96e69d24137a211d6d1d2bd1f72ac49ba5e6af69 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 19 Dec 2024 18:31:06 +0100 Subject: [PATCH 8/9] Blackfire/2.28.21 GUS-W-16223633 --- CHANGELOG.md | 4 ++++ support/build/{blackfire-2.28.19 => blackfire-2.28.21} | 0 2 files changed, 4 insertions(+) rename support/build/{blackfire-2.28.19 => blackfire-2.28.21} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f4cfbadd..766ab37ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ - ext-newrelic/11.4.0.17 [David Zuelke] - ext-blackfire/1.92.30 [David Zuelke] +### CHG + +- Blackfire/2.28.21 [David Zuelke] + ## [v260] - 2024-12-19 ### ADD diff --git a/support/build/blackfire-2.28.19 b/support/build/blackfire-2.28.21 similarity index 100% rename from support/build/blackfire-2.28.19 rename to support/build/blackfire-2.28.21 From 3570b18fc89b5b55f5b677ad8bb266d7c9543407 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 19 Dec 2024 18:31:47 +0100 Subject: [PATCH 9/9] Composer/2.8.4 GUS-W-16223633 --- CHANGELOG.md | 1 + bin/compile | 2 +- support/build/{composer-2.8.3 => composer-2.8.4} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename support/build/{composer-2.8.3 => composer-2.8.4} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 766ab37ea..ced7050f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ ### CHG - Blackfire/2.28.21 [David Zuelke] +- Composer/2.8.4 [David Zuelke] ## [v260] - 2024-12-19 diff --git a/bin/compile b/bin/compile index ec348a7c6..3169fbf5c 100755 --- a/bin/compile +++ b/bin/compile @@ -263,7 +263,7 @@ curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 10 --fail --sil tar xzf $build_dir/.heroku/php-min.tar.gz -C $build_dir/.heroku/php-min rm $build_dir/.heroku/php-min.tar.gz -curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 10 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-2.8.3.tar.gz" || { +curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 10 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-2.8.4.tar.gz" || { mcount "failures.bootstrap.download.composer" error <<-EOF Failed to download Composer for bootstrapping! diff --git a/support/build/composer-2.8.3 b/support/build/composer-2.8.4 similarity index 100% rename from support/build/composer-2.8.3 rename to support/build/composer-2.8.4