Skip to content

Commit

Permalink
Merge pull request #730 from heroku/develop
Browse files Browse the repository at this point in the history
June 2024 PHP Updates
  • Loading branch information
dzuelke authored Jun 13, 2024
2 parents c7384cc + f3e8348 commit 21980cf
Show file tree
Hide file tree
Showing 24 changed files with 20 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/platform-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand All @@ -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!
Expand Down
2 changes: 1 addition & 1 deletion bin/heroku-php-apache2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion support/devcenter/generate.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
$stacks = [
1 => '20', // the offset we start with here is relevant for the numbering of footnotes
'22',
'24',
// '24',
];
}

Expand Down

0 comments on commit 21980cf

Please sign in to comment.