Skip to content

ci: prepare for PHP 8.4.22/8.5.7 rebuilds #3969

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
morrisonlevi merged 3 commits into from
Jun 10, 2026
Merged

ci: prepare for PHP 8.4.22/8.5.7 rebuilds #3969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd99d4a
ci: prepare for PHP 8.4.22/8.5.7 rebuilds
morrisonlevi Jun 9, 2026
5f99a2a
Merge branch 'master' into levi/prepare-ci-rebuilds
morrisonlevi Jun 9, 2026
5a298b9
ci: bump more images to 8.4.22 and 8.5.7
morrisonlevi Jun 9, 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
8 changes: 4 additions & 4 deletions dockerfiles/ci/alpine_compile_extension/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ services:
context: .
x-bake: *bake
args:
phpVersion: 8.4.21
phpSha256Hash: db96ee0a8e5ee7b73a4913a2aeddc162ba2ef16cd34b9347b5b9a6150e1f8e48
phpVersion: 8.4.22
phpSha256Hash: a012c2c9724baf214a70b41b40a7e130906b8855e54268afa5bc4ae17bc9d823
phpApi: 20240924
volumes:
- ../../:/app
Expand All @@ -140,8 +140,8 @@ services:
context: .
x-bake: *bake
args:
phpVersion: 8.5.6
phpSha256Hash: "169aaa21c2834b38df8e39169f43bc5bea8d4059a816cfbc59be08fc2bae60cd"
phpVersion: 8.5.7
phpSha256Hash: "e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049"
phpApi: 20250925
volumes:
- ../../:/app
8 changes: 4 additions & 4 deletions dockerfiles/ci/bookworm/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ services:
args:
<<: *build-base
phpVersion: "8.5"
phpTarGzUrl: https://www.php.net/distributions/php-8.5.6.tar.gz
phpSha256Hash: "169aaa21c2834b38df8e39169f43bc5bea8d4059a816cfbc59be08fc2bae60cd"
phpTarGzUrl: https://www.php.net/distributions/php-8.5.7.tar.gz
phpSha256Hash: "e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049"

php-8.4:
image: datadog/dd-trace-ci:php-8.4_bookworm-$BOOKWORM_NEXT_VERSION
Expand All @@ -35,8 +35,8 @@ services:
args:
<<: *build-base
phpVersion: "8.4"
phpTarGzUrl: https://www.php.net/distributions/php-8.4.21.tar.gz
phpSha256Hash: "db96ee0a8e5ee7b73a4913a2aeddc162ba2ef16cd34b9347b5b9a6150e1f8e48"
phpTarGzUrl: https://www.php.net/distributions/php-8.4.22.tar.gz
phpSha256Hash: "a012c2c9724baf214a70b41b40a7e130906b8855e54268afa5bc4ae17bc9d823"

php-8.3:
image: datadog/dd-trace-ci:php-8.3_bookworm-$BOOKWORM_NEXT_VERSION
Expand Down
32 changes: 0 additions & 32 deletions dockerfiles/ci/bookworm/php-8.5/0001-Disable-preserve_none-under-ASan.patch
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions dockerfiles/ci/bookworm/php-8.5/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ COPY php-8.5/suppr.txt /home/circleci/suppr.txt
FROM --platform=$BUILDPLATFORM $BUILD_BASE AS src
ARG phpTarGzUrl
ARG phpSha256Hash
COPY php-8.5/0001-Disable-preserve_none-under-ASan.patch /home/circleci
RUN set -eux; \
curl -fsSL -o /tmp/php.tar.gz "${phpTarGzUrl}"; \
(echo "${phpSha256Hash} /tmp/php.tar.gz" | sha256sum -c -); \
tar xf /tmp/php.tar.gz -C "${PHP_SRC_DIR}" --strip-components=1; \
rm -f /tmp/php.tar.gz; \
cd ${PHP_SRC_DIR}; \
git apply /home/circleci/0001-Disable-preserve_none-under-ASan.patch; \
# We need to remove the dl() calls from run-tests as some extensions don't properly switch interned string storage for INIs. \
sed -i 's/\bdl(/(bool)(/' run-tests.php; \
./buildconf --force;
Expand Down
8 changes: 4 additions & 4 deletions dockerfiles/ci/centos/7/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ services:
x-bake: *bake
args:
phpVersion: "8.4"
phpTarGzUrl: https://www.php.net/distributions/php-8.4.21.tar.gz
phpSha256Hash: "db96ee0a8e5ee7b73a4913a2aeddc162ba2ef16cd34b9347b5b9a6150e1f8e48"
phpTarGzUrl: https://www.php.net/distributions/php-8.4.22.tar.gz
phpSha256Hash: "a012c2c9724baf214a70b41b40a7e130906b8855e54268afa5bc4ae17bc9d823"
image: 'datadog/dd-trace-ci:php-8.4_centos-7'

php-8.5:
Expand All @@ -128,6 +128,6 @@ services:
x-bake: *bake
args:
phpVersion: "8.5"
phpTarGzUrl: https://www.php.net/distributions/php-8.5.6.tar.gz
phpSha256Hash: "169aaa21c2834b38df8e39169f43bc5bea8d4059a816cfbc59be08fc2bae60cd"
phpTarGzUrl: https://www.php.net/distributions/php-8.5.7.tar.gz
phpSha256Hash: "e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049"
image: 'datadog/dd-trace-ci:php-8.5_centos-7'
12 changes: 6 additions & 6 deletions dockerfiles/ci/windows/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ services:
- windows/amd64
context: .
args:
phpVersion: "8.5.6"
phpVersion: "8.5.7"
vsVersion: "vs17"
phpTarGzUrl: https://www.php.net/distributions/php-8.5.6.tar.gz
phpSha256Hash: "169aaa21c2834b38df8e39169f43bc5bea8d4059a816cfbc59be08fc2bae60cd"
phpTarGzUrl: https://www.php.net/distributions/php-8.5.7.tar.gz
phpSha256Hash: "e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049"

php-8.4:
image: datadog/dd-trace-ci:php-8.4_windows
Expand All @@ -78,10 +78,10 @@ services:
- windows/amd64
context: .
args:
phpVersion: "8.4.21"
phpVersion: "8.4.22"
vsVersion: "vs17"
phpTarGzUrl: https://www.php.net/distributions/php-8.4.21.tar.gz
phpSha256Hash: "db96ee0a8e5ee7b73a4913a2aeddc162ba2ef16cd34b9347b5b9a6150e1f8e48"
phpTarGzUrl: https://www.php.net/distributions/php-8.4.22.tar.gz
phpSha256Hash: "a012c2c9724baf214a70b41b40a7e130906b8855e54268afa5bc4ae17bc9d823"

php-8.3:
image: datadog/dd-trace-ci:php-8.3_windows
Expand Down
2 changes: 2 additions & 0 deletions tests/opcache/jit_trace_num_bailout.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ crash in zend_jit_trace_exit().
if (PHP_VERSION_ID < 80000) die('skip: JIT is only available on PHP 8+');
if (!extension_loaded('Zend OPcache')) die('skip: Zend OPcache is required');
?>
--XFAIL--
PHP 8.5 Bookworm image needs to be rebuilt with ASAN preserve_none enabled
Comment on lines +15 to +16

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Constrain XFAIL to the PHP 8.5 ASAN image

This unconditional --XFAIL-- applies to every make test_opcache run, including the non-ASAN opcache jobs and all PHP 8.x versions generated in .gitlab/generate-tracer.php, even though the reason is specifically the current PHP 8.5 Bookworm ASAN image. In those other contexts, a real regression in this crash test will be reported as an expected failure instead of failing CI, so the temporary waiver should be made conditional in SKIPIF or otherwise limited to the affected PHP 8.5 ASAN environment.

Useful? React with 👍 / 👎.

--ENV--
DD_TRACE_GENERATE_ROOT_SPAN=0
DD_TRACE_LOG_LEVEL=off
Expand Down
Loading