Skip to content

Commit

Permalink
Merge branch 'heroku:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
boboldehampsink authored Sep 30, 2024
2 parents 47c9d37 + 60dd468 commit dc1aa2a
Show file tree
Hide file tree
Showing 31 changed files with 77 additions and 63 deletions.
20 changes: 19 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@
## [Unreleased]


## [v257] - 2024-09-27

### ADD

- PHP/8.1.30 [David Zuelke]
- PHP/8.2.24 [David Zuelke]
- PHP/8.3.12 [David Zuelke]
- ext-ev/1.2.0 [David Zuelke]
- ext-blackfire/1.92.23 [David Zuelke]
- ext-apcu/5.1.24 [David Zuelke]
- ext-mongodb/1.20.0 [David Zuelke]

### CHG

- Composer/2.7.9 [David Zuelke]
- Blackfire/2.28.12 [David Zuelke]

## [v256] - 2024-08-30

### ADD
Expand Down Expand Up @@ -2736,7 +2753,8 @@

- Auto-set and follow (but not enable, for now) the FPM slowlog [David Zuelke]

[unreleased]: https://github.com/heroku/heroku-buildpack-php/compare/v256...main
[unreleased]: https://github.com/heroku/heroku-buildpack-php/compare/v257...main
[v257]: https://github.com/heroku/heroku-buildpack-php/compare/v256...v257
[v256]: https://github.com/heroku/heroku-buildpack-php/compare/v255...v256
[v255]: https://github.com/heroku/heroku-buildpack-php/compare/v254...v255
[v254]: https://github.com/heroku/heroku-buildpack-php/compare/v253...v254
Expand Down
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GEM
base64 (0.2.0)
diff-lcs (1.5.1)
erubis (2.7.0)
excon (0.110.0)
excon (0.111.0)
heroics (0.1.3)
base64
erubis (~> 2.0)
Expand All @@ -27,8 +27,8 @@ GEM
webrick
moneta (1.0.0)
multi_json (1.15.0)
parallel (1.25.1)
parallel_tests (4.7.1)
parallel (1.26.3)
parallel_tests (4.7.2)
parallel
platform-api (3.7.0)
heroics (~> 0.1.1)
Expand All @@ -37,18 +37,18 @@ GEM
rake (13.2.1)
rate_throttle_client (0.1.2)
rrrretry (1.0.0)
rspec-core (3.13.0)
rspec-core (3.13.1)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-retry (0.6.2)
rspec-core (> 3.3)
rspec-support (3.13.1)
sem_version (2.0.1)
thor (1.3.1)
thor (1.3.2)
threaded (0.0.4)
webrick (1.8.1)
webrick (1.8.2)

PLATFORMS
ruby
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.11.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.12.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.8.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.9.tar.gz" || {
mcount "failures.bootstrap.download.composer"
error <<-EOF
Failed to download Composer for bootstrapping!
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.
102 changes: 49 additions & 53 deletions support/devcenter/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dc1aa2a

Please sign in to comment.