Skip to content

Commit 5666782

Browse files
cataphractcataphract
authored
Merge branch 'master' into glopes/libxml2-updates
2 parents 288e04a + 4a26042 commit 5666782

51 files changed

Lines changed: 539 additions & 173 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/prof_asan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
matrix:
1111
php-version: [8.3, 8.4]
1212
container:
13-
image: datadog/dd-trace-ci:php-${{matrix.php-version}}_bookworm-5
13+
image: datadog/dd-trace-ci:php-${{matrix.php-version}}_bookworm-6
1414
# https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
1515
options: --user root --privileged
1616

‎.gitlab/generate-appsec.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"test appsec extension":
6969
stage: test
7070
extends: .appsec_test
71-
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5
71+
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6
7272
variables:
7373
KUBERNETES_CPU_REQUEST: 3
7474
KUBERNETES_MEMORY_REQUEST: 3Gi
@@ -160,7 +160,7 @@
160160
"appsec code coverage":
161161
stage: test
162162
extends: .appsec_test
163-
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.3_bookworm-5
163+
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.3_bookworm-6
164164
variables:
165165
KUBERNETES_CPU_REQUEST: 3
166166
KUBERNETES_MEMORY_REQUEST: 3Gi
@@ -263,7 +263,7 @@
263263
"appsec lint":
264264
stage: test
265265
extends: .appsec_test
266-
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.3_bookworm-5
266+
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.3_bookworm-6
267267
variables:
268268
KUBERNETES_CPU_REQUEST: 3
269269
KUBERNETES_MEMORY_REQUEST: 9Gi
@@ -285,7 +285,7 @@
285285
"test appsec helper asan":
286286
stage: test
287287
extends: .appsec_test
288-
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-5
288+
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-6
289289
variables:
290290
KUBERNETES_CPU_REQUEST: 3
291291
KUBERNETES_MEMORY_REQUEST: 3Gi
@@ -311,7 +311,7 @@
311311
#"fuzz appsec helper":
312312
# stage: test
313313
# extends: .appsec_test
314-
# image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-5
314+
# image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-6
315315
# variables:
316316
# KUBERNETES_CPU_REQUEST: 3
317317
# KUBERNETES_MEMORY_REQUEST: 5Gi

‎.gitlab/generate-package.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
$asan_build_platforms = [
4949
[
5050
"triplet" => "x86_64-unknown-linux-gnu",
51-
"image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_bookworm-5",
51+
"image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_bookworm-6",
5252
"arch" => "amd64",
5353
"host_os" => "linux-gnu",
5454
],
5555
[
5656
"triplet" => "aarch64-unknown-linux-gnu",
57-
"image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_bookworm-5",
57+
"image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_bookworm-6",
5858
"arch" => "arm64",
5959
"host_os" => "linux-gnu",
6060
]
@@ -282,7 +282,7 @@
282282

283283
"pecl build":
284284
stage: tracing
285-
image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-7.4_bookworm-5"
285+
image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-7.4_bookworm-6"
286286
tags: [ "arch:amd64" ]
287287
needs: [ "prepare code" ]
288288
script:
@@ -332,7 +332,7 @@
332332
<?php foreach ($arch_targets as $arch): ?>
333333
"aggregate tracing extension: [<?= $arch ?>]":
334334
stage: tracing
335-
image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-7.4_bookworm-5"
335+
image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-7.4_bookworm-6"
336336
tags: [ "arch:amd64" ]
337337
script: ls ./
338338
variables:
@@ -1084,7 +1084,7 @@
10841084

10851085
"pecl tests":
10861086
stage: verify
1087-
image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_VERSION}_bookworm-5"
1087+
image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_VERSION}_bookworm-6"
10881088
tags: [ "arch:amd64" ]
10891089
services:
10901090
- !reference [.services, request-replayer]
@@ -1235,7 +1235,7 @@
12351235
variables:
12361236
VALGRIND: false
12371237
ARCH: "<?= $arch ?>"
1238-
CONTAINER_SUFFIX: bookworm-5
1238+
CONTAINER_SUFFIX: bookworm-6
12391239
needs:
12401240
- job: "package loader: [<?= $arch ?>]"
12411241
artifacts: true

‎.gitlab/generate-profiler.php‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@
4545

4646
- '# NTS'
4747
- command -v switch-php && switch-php "${PHP_MAJOR_MINOR}"
48-
- cargo build --profile profiler-release --all-features
48+
- cargo build --profile profiler-release
4949
- mkdir -p "${CI_PROJECT_DIR}/artifacts/profiler-tests"
5050
- (cd tests; TEST_PHP_JUNIT="${CI_PROJECT_DIR}/artifacts/profiler-tests/nts-results.xml" php run-tests.php -d "extension=/mnt/ramdisk/cargo/profiler-release/libdatadog_php_profiling.so" --show-diff -g "FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP" "phpt")
5151

5252
- touch build.rs #make sure `build.rs` gets executed after `switch-php` call
5353

5454
- '# ZTS'
5555
- command -v switch-php && switch-php "${PHP_MAJOR_MINOR}-zts"
56-
- cargo build --profile profiler-release --all-features
56+
- cargo build --profile profiler-release
5757
- (cd tests; TEST_PHP_JUNIT="${CI_PROJECT_DIR}/artifacts/profiler-tests/zts-results.xml" php run-tests.php -d "extension=/mnt/ramdisk/cargo/profiler-release/libdatadog_php_profiling.so" --show-diff -g "FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP" "phpt")
5858
after_script:
5959
- .gitlab/upload-junit-to-datadog.sh "test.source.file:profiling"
@@ -67,7 +67,7 @@
6767
"clippy NTS":
6868
stage: test
6969
tags: [ "arch:amd64" ]
70-
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5
70+
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6
7171
variables:
7272
KUBERNETES_CPU_REQUEST: 5
7373
KUBERNETES_MEMORY_REQUEST: 3Gi
@@ -83,3 +83,17 @@
8383
- sed -i -e "s/crate-type.*$/crate-type = [\"rlib\"]/g" Cargo.toml
8484
- cargo clippy --all-targets --all-features -- -D warnings -Aunknown-lints
8585

86+
"Cargo test":
87+
stage: test
88+
tags: [ "arch:amd64" ]
89+
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-8.5_bookworm-5
90+
variables:
91+
KUBERNETES_CPU_REQUEST: 5
92+
KUBERNETES_MEMORY_REQUEST: 3Gi
93+
KUBERNETES_MEMORY_LIMIT: 4Gi
94+
# CARGO_TARGET_DIR: /mnt/ramdisk/cargo # ramdisk??
95+
libdir: /tmp/datadog-profiling
96+
script:
97+
- switch-php nts # not compatible with debug
98+
- cd profiling
99+
- cargo test --all-features

‎.gitlab/generate-shared.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
- IMAGE:
2222
- "datadog/dd-trace-ci:centos-7"
2323
- "datadog/dd-trace-ci:php-compile-extension-alpine"
24-
- "datadog/dd-trace-ci:bookworm-5"
24+
- "datadog/dd-trace-ci:bookworm-6"
2525
script:
2626
- if [ -f "/opt/libuv/lib/pkgconfig/libuv.pc" ]; then export PKG_CONFIG_PATH="/opt/libuv/lib/pkgconfig:$PKG_CONFIG_PATH"; fi
2727
- if [ -d "/opt/catch2" ]; then export CMAKE_PREFIX_PATH=/opt/catch2; fi
@@ -45,7 +45,7 @@
4545
"C components UBSAN":
4646
tags: [ "arch:amd64" ]
4747
stage: test
48-
image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-5"
48+
image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:bookworm-6"
4949
needs: []
5050
script:
5151
- if [ -f "/opt/libuv/lib/pkgconfig/libuv.pc" ]; then export PKG_CONFIG_PATH="/opt/libuv/lib/pkgconfig:$PKG_CONFIG_PATH"; fi
@@ -69,7 +69,7 @@
6969
"Build & Test Tea":
7070
tags: [ "arch:amd64" ]
7171
stage: build
72-
image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5"
72+
image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6"
7373
parallel:
7474
matrix:
7575
- PHP_MAJOR_MINOR: *no_asan_minor_major_targets
@@ -98,7 +98,7 @@
9898
.tea_test:
9999
tags: [ "arch:amd64" ]
100100
stage: test
101-
image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5"
101+
image: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6"
102102
interruptible: true
103103
rules:
104104
- if: $CI_COMMIT_BRANCH == "master"

‎.gitlab/generate-tracer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function before_script_steps($with_docker_auth = false) {
6767
"compile extension: debug":
6868
stage: compile
6969
tags: [ "arch:${ARCH}" ]
70-
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5
70+
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6
7171
parallel:
7272
matrix:
7373
- PHP_MAJOR_MINOR: *all_minor_major_targets
@@ -195,7 +195,7 @@ function before_script_steps($with_docker_auth = false) {
195195
.base_test:
196196
stage: test
197197
tags: [ "arch:${ARCH}" ]
198-
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-5
198+
image: registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_bookworm-6
199199
timeout: 60m
200200
interruptible: true
201201
rules:

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,8 +1211,8 @@ define run_tests_debug
12111211
(set -o pipefail; { $(call run_tests,$(1)) 2>&1 >&3 | \
12121212
tee >(grep --line-buffered -vE '\[ddtrace\] \[debug\]|\[ddtrace\] \[info\]' >&2) | \
12131213
{ ! (grep --line-buffered -E '\[error\]|\[warning\]|\[deprecated\]' >/dev/null && \
1214-
echo $$'\033[41m'"ERROR: Found debug log errors in the output."$$'\033[0m'); }; } 3>&1); \
1215-
timeout 10 bash -c 'wait' 2>/dev/null || true
1214+
echo $$'\033[41m'"ERROR: Found debug log errors in the output."$$'\033[0m'); }; } 3>&1 \
1215+
) && ([ -n "${DD_TRACE_DOCKER_DEBUG}" ] || timeout 10 bash -c 'wait' 2>/dev/null || true) \
12161216
$(eval TEST_EXTRA_ENV=)
12171217
endef
12181218

‎dockerfiles/ci/bookworm/.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
BOOKWORM_CURRENT_VERSION=6
2-
BOOKWORM_NEXT_VERSION=7
2+
BOOKWORM_NEXT_VERSION=6

‎dockerfiles/ci/bookworm/docker-compose.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ services:
2222
args:
2323
<<: *build-base
2424
phpVersion: "8.5"
25-
phpTarGzUrl: https://downloads.php.net/~daniels/php-8.5.0RC3.tar.gz
26-
phpSha256Hash: "937e544d72ee1eb28d2190cadaadf8e5e8d7d8c365b5c1f6a99b4f979a1f3a1b"
25+
phpTarGzUrl: https://www.php.net/distributions/php-8.5.1.tar.gz
26+
phpSha256Hash: "915492958081409a5e3ef99df969bcfa5b33bdf9517bd077991747e17fa2c1b7"
2727

2828
php-8.4:
2929
image: datadog/dd-trace-ci:php-8.4_bookworm-$BOOKWORM_NEXT_VERSION
@@ -34,8 +34,8 @@ services:
3434
args:
3535
<<: *build-base
3636
phpVersion: "8.4"
37-
phpTarGzUrl: https://www.php.net/distributions/php-8.4.6.tar.gz
38-
phpSha256Hash: "49be0f2f45c9b07c9b921d023bf28b1fc781700c829869725681300e72e3faa8"
37+
phpTarGzUrl: https://www.php.net/distributions/php-8.4.16.tar.gz
38+
phpSha256Hash: "8e35d24f148ea7c2a93e9b9bcc329e8bf78b5bb922f3723a727c74c19d184e98"
3939

4040
php-8.3:
4141
image: datadog/dd-trace-ci:php-8.3_bookworm-$BOOKWORM_NEXT_VERSION
@@ -46,8 +46,8 @@ services:
4646
args:
4747
<<: *build-base
4848
phpVersion: "8.3"
49-
phpTarGzUrl: https://www.php.net/distributions/php-8.3.20.tar.gz
50-
phpSha256Hash: "515ed37529df6b7f569ba68d505713bce23a93a58471dedac4ecfd17c44e5650"
49+
phpTarGzUrl: https://www.php.net/distributions/php-8.3.29.tar.gz
50+
phpSha256Hash: "8565fa8733c640b60da5ab4944bf2d4081f859915b39e29b3af26cf23443ed97"
5151

5252
php-8.2:
5353
image: datadog/dd-trace-ci:php-8.2_bookworm-$BOOKWORM_NEXT_VERSION

‎dockerfiles/ci/xfail_tests/8.5.list‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,11 @@ ext/standard/tests/streams/proc_open_bug69900.phpt
178178
ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt
179179
ext/standard/tests/strings/gh15613.phpt
180180
ext/standard/tests/strings/sprintf_variation54.phpt
181+
ext/uri/tests/whatwg/parsing/query_success_null_byte.phpt
182+
ext/uri/tests/whatwg/parsing/username_success_null_byte.phpt
183+
ext/uri/tests/whatwg/parsing/password_success_null_byte.phpt
184+
ext/uri/tests/whatwg/reference_resolution/resolve_success_path_null_byte.phpt
185+
ext/uri/tests/whatwg/parsing/path_success_null_byte.phpt
181186
ext/zend_test/tests/
182187
sapi/cli/tests/bug80092.phpt
183188
sapi/cli/tests/gh8827-001.phpt

0 commit comments

Comments
 (0)