diff --git a/.github/workflows/platform-sync.yml b/.github/workflows/platform-sync.yml index 264cc8b70..c4e1d39d2 100644 --- a/.github/workflows/platform-sync.yml +++ b/.github/workflows/platform-sync.yml @@ -265,6 +265,8 @@ jobs: needs: devcenter-generate if: ${{ needs.devcenter-generate.outputs.diff_result == 1 }} runs-on: ubuntu-22.04 + env: + HEROKU_DEVCENTER_API_TOKEN: ${{ secrets.HEROKU_DEVCENTER_API_TOKEN }} steps: - name: Checkout uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index ba12c608d..7bb0930b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,20 @@ ## [Unreleased] +### ADD + +- PHP/8.1.29 [David Zuelke] +- PHP/8.2.20 [David Zuelke] +- PHP/8.3.8 [David Zuelke] +- ext-newrelic/10.21.0.11 [David Zuelke] +- ext-mongodb/1.19.2 [David Zuelke] + +### CHG + +- Nginx/1.26.1 [David Zuelke] +- Blackfire/2.28.4 [David Zuelke] +- Composer/2.2.24 [David Zuelke] +- Composer/2.7.7 [David Zuelke] ## [v252] - 2024-05-31 diff --git a/bin/compile b/bin/compile index e4d018056..1016f3ef2 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.7.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.8.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! @@ -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.7.6.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.7.7.tar.gz" || { mcount "failures.bootstrap.download.composer" error <<-EOF Failed to download Composer for bootstrapping! diff --git a/bin/heroku-php-apache2 b/bin/heroku-php-apache2 index 74b895291..75087c36c 100755 --- a/bin/heroku-php-apache2 +++ b/bin/heroku-php-apache2 @@ -641,7 +641,7 @@ fi ) & pids+=($!) ( - trap 'echo "nginx" >&3; wait 2> /dev/null' EXIT + trap 'echo "httpd" >&3; wait 2> /dev/null' EXIT trap '' INT; # wait for FPM to write its PID file, which it does after initialization diff --git a/support/build/blackfire-2.28.3 b/support/build/blackfire-2.28.4 similarity index 100% rename from support/build/blackfire-2.28.3 rename to support/build/blackfire-2.28.4 diff --git a/support/build/composer-2.2.23 b/support/build/composer-2.2.24 similarity index 100% rename from support/build/composer-2.2.23 rename to support/build/composer-2.2.24 diff --git a/support/build/composer-2.7.6 b/support/build/composer-2.7.7 similarity index 100% rename from support/build/composer-2.7.6 rename to support/build/composer-2.7.7 diff --git a/support/build/extensions/no-debug-non-zts-20180731/newrelic-10.20.0.10 b/support/build/extensions/no-debug-non-zts-20180731/newrelic-10.21.0.11 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/newrelic-10.20.0.10 rename to support/build/extensions/no-debug-non-zts-20180731/newrelic-10.21.0.11 diff --git a/support/build/extensions/no-debug-non-zts-20190902/mongodb-1.19.1 b/support/build/extensions/no-debug-non-zts-20190902/mongodb-1.19.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20190902/mongodb-1.19.1 rename to support/build/extensions/no-debug-non-zts-20190902/mongodb-1.19.2 diff --git a/support/build/extensions/no-debug-non-zts-20190902/newrelic-10.20.0.10 b/support/build/extensions/no-debug-non-zts-20190902/newrelic-10.21.0.11 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20190902/newrelic-10.20.0.10 rename to support/build/extensions/no-debug-non-zts-20190902/newrelic-10.21.0.11 diff --git a/support/build/extensions/no-debug-non-zts-20200930/mongodb-1.19.1 b/support/build/extensions/no-debug-non-zts-20200930/mongodb-1.19.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20200930/mongodb-1.19.1 rename to support/build/extensions/no-debug-non-zts-20200930/mongodb-1.19.2 diff --git a/support/build/extensions/no-debug-non-zts-20200930/newrelic-10.20.0.10 b/support/build/extensions/no-debug-non-zts-20200930/newrelic-10.21.0.11 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20200930/newrelic-10.20.0.10 rename to support/build/extensions/no-debug-non-zts-20200930/newrelic-10.21.0.11 diff --git a/support/build/extensions/no-debug-non-zts-20210902/mongodb-1.19.1 b/support/build/extensions/no-debug-non-zts-20210902/mongodb-1.19.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20210902/mongodb-1.19.1 rename to support/build/extensions/no-debug-non-zts-20210902/mongodb-1.19.2 diff --git a/support/build/extensions/no-debug-non-zts-20210902/newrelic-10.20.0.10 b/support/build/extensions/no-debug-non-zts-20210902/newrelic-10.21.0.11 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20210902/newrelic-10.20.0.10 rename to support/build/extensions/no-debug-non-zts-20210902/newrelic-10.21.0.11 diff --git a/support/build/extensions/no-debug-non-zts-20220829/mongodb-1.19.1 b/support/build/extensions/no-debug-non-zts-20220829/mongodb-1.19.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20220829/mongodb-1.19.1 rename to support/build/extensions/no-debug-non-zts-20220829/mongodb-1.19.2 diff --git a/support/build/extensions/no-debug-non-zts-20220829/newrelic-10.20.0.10 b/support/build/extensions/no-debug-non-zts-20220829/newrelic-10.21.0.11 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20220829/newrelic-10.20.0.10 rename to support/build/extensions/no-debug-non-zts-20220829/newrelic-10.21.0.11 diff --git a/support/build/extensions/no-debug-non-zts-20230831/mongodb-1.19.1 b/support/build/extensions/no-debug-non-zts-20230831/mongodb-1.19.2 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20230831/mongodb-1.19.1 rename to support/build/extensions/no-debug-non-zts-20230831/mongodb-1.19.2 diff --git a/support/build/extensions/no-debug-non-zts-20230831/newrelic-10.20.0.10 b/support/build/extensions/no-debug-non-zts-20230831/newrelic-10.21.0.11 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20230831/newrelic-10.20.0.10 rename to support/build/extensions/no-debug-non-zts-20230831/newrelic-10.21.0.11 diff --git a/support/build/nginx-1.24.0 b/support/build/nginx-1.26.1 similarity index 100% rename from support/build/nginx-1.24.0 rename to support/build/nginx-1.26.1 diff --git a/support/build/php-8.1.28 b/support/build/php-8.1.29 similarity index 100% rename from support/build/php-8.1.28 rename to support/build/php-8.1.29 diff --git a/support/build/php-8.2.19 b/support/build/php-8.2.20 similarity index 100% rename from support/build/php-8.2.19 rename to support/build/php-8.2.20 diff --git a/support/build/php-8.3.7 b/support/build/php-8.3.8 similarity index 100% rename from support/build/php-8.3.7 rename to support/build/php-8.3.8 diff --git a/support/build/php-min-8.3.7 b/support/build/php-min-8.3.8 similarity index 100% rename from support/build/php-min-8.3.7 rename to support/build/php-min-8.3.8 diff --git a/support/devcenter/generate.php b/support/devcenter/generate.php index 68bfd01b2..512a371f9 100755 --- a/support/devcenter/generate.php +++ b/support/devcenter/generate.php @@ -26,7 +26,7 @@ $stacks = [ 1 => '20', // the offset we start with here is relevant for the numbering of footnotes '22', - '24', + // '24', ]; }