Skip to content

Commit

Permalink
Merge pull request #651 from heroku/develop
Browse files Browse the repository at this point in the history
v238
  • Loading branch information
dzuelke authored Sep 1, 2023
2 parents 9d68b48 + 86df1f8 commit dc93c26
Show file tree
Hide file tree
Showing 19 changed files with 29 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ jobs:
php-version: "8.1"
tools: "composer:2.4"
- name: Hatchet setup
run: bundle exec hatchet ci:setup
run: |
bundle exec hatchet ci:setup
heroku update --version 8.1.9
- name: Export HEROKU_PHP_PLATFORM_REPOSITORIES to …-develop (since we are not building main or a tag)
if: github.ref_type != 'tag' && github.ref_name != 'main'
run: |
Expand Down
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
# heroku-buildpack-php CHANGELOG

## v238 (2023-08-??)
## v238 (2023-08-31)

### ADD

- ext-phalcon/5.3.0 [David Zuelke]
- ext-mongodb/1.16.2 [David Zuelke]
- ext-amqp/2.0.0 [David Zuelke]
- PHP/8.1.23 [David Zuelke]
- PHP/8.2.10 [David Zuelke]

### CHG

- Import telemetry helper shell functions previously vendored from 'lang-common' S3 bucket [David Zuelke]
- blackfire/2.21.0 [David Zuelke]

## v237 (2023-08-04)

Expand Down
2 changes: 1 addition & 1 deletion 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.22.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.23.tar.gz" || {
mcount "failures.bootstrap.download.php-min"
error <<-EOF
Failed to download minimal PHP for bootstrapping!
Expand Down
File renamed without changes.
5 changes: 5 additions & 0 deletions support/build/extensions/no-debug-non-zts-20200930/amqp-2.0.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/php
# Build Deps: php-8.0.*

source $(dirname $0)/../no-debug-non-zts-20180731/amqp
5 changes: 5 additions & 0 deletions support/build/extensions/no-debug-non-zts-20210902/amqp-2.0.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/php
# Build Deps: php-8.1.*

source $(dirname $0)/../no-debug-non-zts-20180731/amqp
5 changes: 5 additions & 0 deletions support/build/extensions/no-debug-non-zts-20220829/amqp-2.0.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env bash
# Build Path: /app/.heroku/php
# Build Deps: php-8.2.*

source $(dirname $0)/../no-debug-non-zts-20180731/amqp
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit dc93c26

Please sign in to comment.