Skip to content

Commit

Permalink
Allocate more memory for link_extension step (#2866)
Browse files Browse the repository at this point in the history
* Verify compilation actually properly passes

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

* Allocate more memory for link_extension step

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

---------

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
  • Loading branch information
bwoebi authored Oct 1, 2024
1 parent f4b4015 commit 0678d4f
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions .circleci/continue_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3538,13 +3538,17 @@ jobs:
name: Link sidecar and extension
command: |
sed -i 's/-export-symbols .*\/ddtrace\.sym/-Wl,--retain-symbols-file=ddtrace.sym/g' ddtrace_$(uname -m)<< parameters.libddtrace_suffix >>.ldflags
pids=()
for archive in extensions_$(uname -m)/*.a; do
(
gcc -shared -Wl,-whole-archive $archive -Wl,-no-whole-archive $(cat ddtrace_$(uname -m)<< parameters.libddtrace_suffix >>.ldflags) libddtrace_php_$(uname -m)<< parameters.libddtrace_suffix >>.a -Wl,-soname -Wl,ddtrace.so -o ${archive%.a}.so
objcopy --compress-debug-sections ${archive%.a}.so
) &
pids+=($!)
done
for pid in "${pids[@]}"; do
wait $pid
done
wait
- persist_to_workspace:
root: '.'
paths: [ './extensions_*' ]
Expand Down Expand Up @@ -4282,7 +4286,7 @@ workflows:
- "Compile alpine x86_64 PHP 8.2"
- "Compile alpine x86_64 PHP 8.3"
libddtrace_suffix: "-alpine"
resource_class: "medium"
resource_class: "large"
name: "Link x86_64 alpine"
docker_image: "datadog/dd-trace-ci:php-compile-extension-alpine"
- link_extension:
Expand All @@ -4298,7 +4302,7 @@ workflows:
- "Compile alpine aarch64 PHP 8.2"
- "Compile alpine aarch64 PHP 8.3"
libddtrace_suffix: "-alpine"
resource_class: "arm.medium"
resource_class: "arm.large"
name: "Link aarch64 alpine"
docker_image: "datadog/dd-trace-ci:php-compile-extension-alpine"
- compile_extension_centos:
Expand Down

0 comments on commit 0678d4f

Please sign in to comment.