Skip to content

Add support for PHP 8.5 images #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
poespas merged 3 commits into from
Jul 29, 2026
Merged

Add support for PHP 8.5 images #200

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18ae047
Add support for PHP 8.5 images
Jul 28, 2026
df257dc
Use the MySQL 8.4 image for the PHP 8.5 integration tests
poespas Jul 28, 2026
4f88bf4
Chown the Magento install to app before rsyncing it to the deploy con…
poespas Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
- "8.2"
- "8.3"
- "8.4"
- "8.5"
node_version:
- 16
- 18
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
integration_test:
strategy:
matrix:
php_version: [8.1, 8.2, 8.3, 8.4]
php_version: [8.1, 8.2, 8.3, 8.4, 8.5]
testsuite: [general, brancher]
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -34,6 +34,7 @@ jobs:
code_quality:
strategy:
matrix:
# PHP 8.5 is not yet compatible with our current version of deployer
php_version: [8.1, 8.2, 8.3, 8.4]
runs-on: ubuntu-latest
steps:
Expand Down
6 changes: 5 additions & 1 deletion ci/build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ RUN apt-get install -y --no-install-recommends \
php${PHP_VERSION}-mbstring \
php${PHP_VERSION}-mysql \
php${PHP_VERSION}-odbc \
php${PHP_VERSION}-opcache \
php${PHP_VERSION}-pgsql \
php${PHP_VERSION}-pspell \
php${PHP_VERSION}-readline \
Expand All @@ -81,6 +80,11 @@ RUN apt-get install -y --no-install-recommends \
php${PHP_VERSION}-xml \
php${PHP_VERSION}-zip

# Since PHP 8.5 opcache is compiled into PHP itself and no separate package exists
RUN if dpkg --compare-versions "${PHP_VERSION}" lt "8.5"; then \
apt-get install -y --no-install-recommends php${PHP_VERSION}-opcache; \
fi

# Confirm NodeJS & NPM are installed
RUN node -v && npm -v

Expand Down
5 changes: 4 additions & 1 deletion ci/test/run-general.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ set -e
set -x

export PHP_VERSION_SHORT=$(echo "${PHP_VERSION:-8.2}" | sed 's/\.//')
if [[ "${PHP_VERSION:-8.2}" == "8.4" ]]; then
if [[ "${PHP_VERSION:-8.2}" == "8.4" || "${PHP_VERSION:-8.2}" == "8.5" ]]; then
export IMAGE_OS="bookworm"
else
export IMAGE_OS="buster"
fi

if [[ "${PHP_VERSION:-8.2}" == "8.1" ]]; then
export MAGENTO_VERSION="2.4.6-p10"
elif [[ "${PHP_VERSION:-8.2}" == "8.5" ]]; then
# Magento 2.4.9 is the first release compatible with PHP 8.5
export MAGENTO_VERSION="2.4.9"
else
export MAGENTO_VERSION="2.4.8"
fi
Expand Down
Loading