Merge branch 'main' of github.com:heroku/heroku-buildpack-php

# Conflicts:
#	.github/workflows/ci-cleanup.yml

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ env:
 
 jobs:
   integration-test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         stack: ["heroku-20", "heroku-22", "heroku-24"]
@@ -52,11 +52,14 @@ jobs:
           tools: "composer:2.7"
       - name: Install packages from requirements.txt, plus s5cmd (for some tests)
         run: |
+          export VIRTUAL_ENV=$HOME/.venv
+          python3 -m venv "$VIRTUAL_ENV"
+          export PATH=$VIRTUAL_ENV/bin:$PATH
           pip install -r requirements.txt
           curl -sSLO https://github.com/peak/s5cmd/releases/download/v${S5CMD_VERSION}/s5cmd_${S5CMD_VERSION}_linux_amd64.deb
           echo "$S5CMD_HASH" | shasum -c -
           dpkg -x "s5cmd_${S5CMD_VERSION}_linux_amd64.deb" .
-          echo "$HOME/usr/bin" >> "$GITHUB_PATH"
+          echo "$HOME/usr/bin:$VIRTUAL_ENV/bin" >> "$GITHUB_PATH"
       - name: Hatchet setup
         run: bundle exec hatchet ci:setup
       - name: Export HEROKU_PHP_PLATFORM_REPOSITORIES to …${{env.src_path_suffix}} (since we are not building main or a tag)

.github/workflows/platform-build.yml

@@ -41,7 +41,7 @@ permissions:
 
 jobs:
   formulae-list:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       formulae: ${{ steps.expand-formulae.outputs.matrix }}
     steps:
@@ -62,7 +62,7 @@ jobs:
           ls -f ${{inputs.formulae}} | xargs -n 1 echo - >> "$GITHUB_STEP_SUMMARY"
           ls -f ${{inputs.formulae}} | jq -jcRn '[inputs|select(length>0)]' >> "$GITHUB_OUTPUT"
   docker-build:
-    runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-small' || 'ubuntu-22.04' }}
+    runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-24.04-arm-small' || 'ubuntu-24.04' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -85,8 +85,9 @@ jobs:
   deploys:
     needs: [formulae-list, docker-build]
     if: ${{ needs.formulae-list.outputs.formulae != '[]' && needs.formulae-list.outputs.formulae != '' }}
-    runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-xlarge' || 'pub-hk-ubuntu-22.04-xlarge' }}
+    runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-24.04-arm-xlarge' || 'pub-hk-ubuntu-24.04-xlarge' }}
     strategy:
+      fail-fast: false
       max-parallel: ${{ fromJSON(inputs.concurrency) }}
       matrix:
         formula: ${{ fromJSON(needs.formulae-list.outputs.formulae) }}
@@ -115,7 +116,7 @@ jobs:
   mkrepo:
     needs: [deploys]
     if: ${{ inputs.dry-run == false }}
-    runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-small' || 'ubuntu-22.04' }}
+    runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-24.04-arm-small' || 'ubuntu-24.04' }}
     env:
       AWS_ACCESS_KEY_ID:  ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/platform-remove.yml

@@ -28,7 +28,7 @@ permissions:
 
 jobs:
   remove:
-    runs-on: ${{ endsWith(inputs.stack, 'arm64') && 'pub-hk-ubuntu-22.04-arm-small' || 'ubuntu-22.04' }}
+    runs-on: ${{ endsWith(inputs.stack, 'arm64') && 'pub-hk-ubuntu-24.04-arm-small' || 'ubuntu-24.04' }}
     env:
       AWS_ACCESS_KEY_ID:  ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/platform-sync.yml

@@ -45,7 +45,7 @@ permissions:
 
 jobs:
   stack-list:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       stacks: ${{ steps.list-stacks.outputs.matrix }}
     steps:
@@ -61,7 +61,7 @@ jobs:
   docker-build:
     needs: stack-list
     if: ${{ needs.stack-list.outputs.stacks != '[]' && needs.stack-list.outputs.stacks != '' }}
-    runs-on: ${{ endsWith(matrix.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-small' || 'ubuntu-22.04' }}
+    runs-on: ${{ endsWith(matrix.stack, '-arm64') && 'pub-hk-ubuntu-24.04-arm-small' || 'ubuntu-24.04' }}
     strategy:
       matrix:
         stack: ${{ fromJSON(needs.stack-list.outputs.stacks) }}
@@ -89,7 +89,7 @@ jobs:
     strategy:
       matrix:
         stack: ${{ fromJSON(needs.stack-list.outputs.stacks) }}
-    runs-on: ${{ endsWith(matrix.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-small' || 'ubuntu-22.04' }}
+    runs-on: ${{ endsWith(matrix.stack, '-arm64') && 'pub-hk-ubuntu-24.04-arm-small' || 'ubuntu-24.04' }}
     env:
       AWS_ACCESS_KEY_ID:  ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -135,7 +135,7 @@ jobs:
           echo '```' >> "$GITHUB_STEP_SUMMARY"
   devcenter-generate:
     needs: sync
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       diff_result: ${{ steps.diff.outputs.diff_result }}
     steps:
@@ -264,7 +264,7 @@ jobs:
   devcenter-update:
     needs: devcenter-generate
     if: ${{ needs.devcenter-generate.outputs.diff_result == 1 }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       HEROKU_DEVCENTER_API_TOKEN:  ${{ secrets.HEROKU_DEVCENTER_API_TOKEN }}
     steps:
@@ -326,7 +326,7 @@ jobs:
           echo 'Successfully updated ["PHP Support" Dev Center article](https://devcenter.heroku.com/articles/php-support) with synced packages.' >> "$GITHUB_STEP_SUMMARY"
   changelog-generate:
     needs: sync
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

CHANGELOG.md

@@ -3,6 +3,23 @@
 ## [Unreleased]
 
 
+## [v255] - 2024-08-02
+
+### ADD
+
+- PHP/8.2.22 [David Zuelke]
+- PHP/8.3.10 [David Zuelke]
+- ext-phalcon/5.8.0 [David Zuelke]
+- ext-event/3.1.4 [David Zuelke]
+- ext-newrelic/11.0.0.13 [David Zuelke]
+- ext-blackfire/1.92.21 [David Zuelke]
+
+### CHG
+
+- librdkafka/2.5.0 [David Zuelke]
+- Apache/2.4.62 [David Zuelke]
+- Blackfire/2.28.10 [David Zuelke]
+
 ## [v254] - 2024-07-05
 
 ### ADD
@@ -2704,7 +2721,8 @@
 
 - Auto-set and follow (but not enable, for now) the FPM slowlog [David Zuelke]
 
-[unreleased]: https://github.com/heroku/heroku-buildpack-php/compare/v254...main
+[unreleased]: https://github.com/heroku/heroku-buildpack-php/compare/v255...main
+[v255]: https://github.com/heroku/heroku-buildpack-php/compare/v254...v255
 [v254]: https://github.com/heroku/heroku-buildpack-php/compare/v253...v254
 [v253]: https://github.com/heroku/heroku-buildpack-php/compare/v252...v253
 [v252]: https://github.com/heroku/heroku-buildpack-php/compare/v251...v252

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.9.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.10.tar.gz" || {
 	mcount "failures.bootstrap.download.php-min"
 	error <<-EOF
 		Failed to download minimal PHP for bootstrapping!

support/build/extensions/no-debug-non-zts-20180731/newrelic-11.0.0.13

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+
+source $(dirname $0)/../no-debug-non-zts-20180731/newrelic

support/build/extensions/no-debug-non-zts-20190902/newrelic-11.0.0.13

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+
+source $(dirname $0)/../no-debug-non-zts-20180731/newrelic

support/build/extensions/no-debug-non-zts-20200930/newrelic-11.0.0.13

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+
+source $(dirname $0)/../no-debug-non-zts-20180731/newrelic

support/build/extensions/no-debug-non-zts-20210902/newrelic-11.0.0.13

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+
+source $(dirname $0)/../no-debug-non-zts-20180731/newrelic

support/build/extensions/no-debug-non-zts-20220829/newrelic-11.0.0.13

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+
+source $(dirname $0)/../no-debug-non-zts-20180731/newrelic

support/build/extensions/no-debug-non-zts-20230831/newrelic-11.0.0.13

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/php
+
+source $(dirname $0)/../no-debug-non-zts-20180731/newrelic

support/build/libraries/librdkafka

@@ -26,6 +26,14 @@ if [[ "$missing" ]]; then
 	apt-get install -q -y $missing
 fi
 
+if [[ $STACK == heroku-2[02] && $dep_version == 2.* ]]; then
+	echo "librdkafka 2.x is heroku-24+ only"
+	exit 1
+elif [[ $STACK != heroku-2[02] && $dep_version == 1.* ]]; then
+	echo "librdkafka 1.x is heroku-{20,22} only"
+	exit 1
+fi
+
 echo "-----> Building ${dep_package}..."
 
 curl -L ${dep_url} | tar xz