Skip to content

Commit

Permalink
Merge pull request #761 from heroku/2024-10-updates
Browse files Browse the repository at this point in the history
October 2024 package updates
  • Loading branch information
dzuelke authored Oct 31, 2024
2 parents 60dd468 + 5671bef commit 041da1c
Show file tree
Hide file tree
Showing 51 changed files with 30 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: "8.2"
tools: "composer:2.7"
tools: "composer:2.8"
- name: Install packages from requirements.txt, plus s5cmd (for some tests)
run: |
export VIRTUAL_ENV=$HOME/.venv
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/platform-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: "8.2"
tools: "composer:2.7"
tools: "composer:2.8"
- name: Install Dev Center generator dependencies
run: |
composer install -d support/devcenter/
Expand Down Expand Up @@ -334,7 +334,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
php-version: "8.2"
tools: "composer:2.7"
tools: "composer:2.8"
- name: Install Dev Center generator dependencies
run: |
composer install -d support/devcenter/
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

## [Unreleased]

### ADD

- PHP/8.2.25 [David Zuelke]
- PHP/8.3.13 [David Zuelke]
- ext-redis/6.1.0 [David Zuelke]
- ext-uuid/1.2.1 [David Zuelke]
- ext-oauth/2.0.9 [David Zuelke]
- ext-memcached/3.3.0 [David Zuelke]
- ext-rdkafka/6.0.4 [David Zuelke]
- ext-newrelic/11.3.0.16 [David Zuelke]
- ext-blackfire/1.92.27 [David Zuelke]

### CHG

- Composer/2.8.2 [David Zuelke]
- Blackfire/2.28.17 [David Zuelke]

## [v257] - 2024-09-27

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.12.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.13.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.9.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.8.2.tar.gz" || {
mcount "failures.bootstrap.download.composer"
error <<-EOF
Failed to download Composer for bootstrapping!
Expand Down
File renamed without changes.
5 changes: 5 additions & 0 deletions support/build/composer-2.8.2
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-min-*

source $(dirname $0)/composer
4 changes: 4 additions & 0 deletions support/build/extensions/no-debug-non-zts-20180731/memcached
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ if [[ "$missing" ]]; then
apt-get install -q -y $missing
fi

if [[ $dep_version != 3.[012].* ]]; then
CONFIGURE_EXTRA="--with-zstd"
fi

MANIFEST_EXTRA="${MANIFEST_EXTRA:-"{\"config\":\"etc/php/conf.d/memcached.ini-dist\"}"}"

source $(dirname $BASH_SOURCE)/../pecl
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 041da1c

Please sign in to comment.