Skip to content

Commit

Permalink
Merge pull request #674 from heroku/develop
Browse files Browse the repository at this point in the history
v243
  • Loading branch information
dzuelke authored Dec 22, 2023
2 parents 1d568bb + 71fe70f commit 245a57a
Show file tree
Hide file tree
Showing 26 changed files with 23 additions and 3 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# heroku-buildpack-php CHANGELOG

## v243 (2023-12-21)

### ADD

- PHP/8.1.27 [David Zuelke]
- PHP/8.2.14 [David Zuelke]
- PHP/8.3.1 [David Zuelke]
- ext-blackfire/1.92.4 [David Zuelke]
- ext-mongodb/1.17.2 [David Zuelke]
- ext-newrelic/10.15.0.4 [David Zuelke]

### CHG

- Composer/2.6.6 [David Zuelke]
- blackfire/2.24.2 [David Zuelke]

## v242 (2023-12-07)

### ADD
Expand Down
4 changes: 2 additions & 2 deletions bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,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 5 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-8.1.26.tar.gz" || {
curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 5 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-8.1.27.tar.gz" || {
mcount "failures.bootstrap.download.php-min"
error <<-EOF
Failed to download minimal PHP for bootstrapping!
Expand All @@ -258,7 +258,7 @@ curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 5 --fail --sile
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 5 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-2.6.5.tar.gz" || {
curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 5 --fail --silent --location -o $build_dir/.heroku/composer.tar.gz "${s3_url}composer-2.6.6.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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/php

source $(dirname $0)/../no-debug-non-zts-20180731/newrelic
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion test/spec/newrelic_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# a NEW_RELIC_LICENSE_KEY triggers the automatic installation of ext-newrelic at the end of the build
@app = new_app_with_stack_and_platrepo('test/fixtures/bootopts',
config: { "NEW_RELIC_LOG_LEVEL" => "info", "NEW_RELIC_LICENSE_KEY" => "thiswilltriggernewrelic" },
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs 'php:8.2.*'") or raise "Failed to require PHP version" },
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs 'php:*'") or raise "Failed to require PHP version" },
run_multi: true
)
end
Expand Down

0 comments on commit 245a57a

Please sign in to comment.