Skip to content
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

Allocate more memory for link_extension step #2866

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Allocate more memory for link_extension step #2866

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc1e78c
Verify compilation actually properly passes
bwoebi Oct 1, 2024
61f99d4
Allocate more memory for link_extension step
bwoebi Oct 1, 2024
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
10 changes: 7 additions & 3 deletions .circleci/continue_config.yml
View file
Open in desktop
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
Loading