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

fix: Installer tests version lock #2630

Merged
merged 3 commits into from
Apr 17, 2024
Merged

fix: Installer tests version lock #2630

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
c130eb0
fix: Installer tests version lock
PROFeNoM Apr 17, 2024
db8007c
fix: Installer tests version lock
PROFeNoM Apr 17, 2024
b771ef3
fix: Installer tests version lock
PROFeNoM Apr 17, 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
5 changes: 2 additions & 3 deletions dockerfiles/verify_packages/installer/test_install_custom_ext_dir_and_ini.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ set -e
assert_no_ddtrace

# Install using the php installer
trace_version="0.99.0"
generate_installers "${trace_version}"
trace_version=$(cat VERSION)
custom_ini_file="$(get_php_conf_dir)/40-ddtrace.ini"
php ./build/packages/datadog-setup.php --php-bin php --extension-dir /custom-ext-dir --enable-profiling --ini "$custom_ini_file"

Expand All @@ -19,4 +18,4 @@ assert_ddtrace_version "${trace_version}"
assert_profiler_installed
assert_appsec_installed

assert_request_init_hook_exists
assert_sources_path_exists
5 changes: 2 additions & 3 deletions dockerfiles/verify_packages/installer/test_install_custom_extension_directory.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ set -e
assert_no_ddtrace

# Install using the php installer
trace_version="0.99.0"
generate_installers "${trace_version}"
trace_version=$(cat VERSION)
php ./build/packages/datadog-setup.php --php-bin php --extension-dir /custom-ext-dir --enable-profiling

assert_file_exists /custom-ext-dir/ddtrace.so
Expand All @@ -18,4 +17,4 @@ assert_ddtrace_version "${trace_version}"
assert_profiler_installed
assert_appsec_installed

assert_request_init_hook_exists
assert_sources_path_exists
5 changes: 2 additions & 3 deletions dockerfiles/verify_packages/installer/test_install_custom_ini_file.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ set -e
assert_no_ddtrace

# Install using the php installer
trace_version="0.99.0"
generate_installers "${trace_version}"
trace_version=$(cat VERSION)
custom_ini_file="$(get_php_conf_dir)/40-ddtrace.ini"
php ./build/packages/datadog-setup.php --php-bin php --ini "$custom_ini_file" --enable-profiling

assert_ddtrace_version "${trace_version}"
assert_profiler_installed
assert_appsec_installed

assert_request_init_hook_exists
assert_sources_path_exists
Loading