Skip to content

Commit 0e8571c

Browse files
need to clean
1 parent 9b81954 commit 0e8571c

File tree

2 files changed

+3
-21
lines changed

2 files changed

+3
-21
lines changed

.circleci/continue_config.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ commands:
529529
type: string
530530
steps:
531531
- run:
532-
name: Build Profiler NTS
532+
name: Build Profiler
533533
command: |
534534
if [ -d '/opt/rh/devtoolset-7' ] ; then
535535
set +eo pipefail
@@ -545,22 +545,9 @@ commands:
545545
cargo build --release
546546
cd -
547547
cp -v "${CARGO_TARGET_DIR}/release/libdatadog_php_profiling.so" "${prefix}/datadog-profiling.so"
548-
- run:
549-
name: Build Profiler ZTS
550-
command: |
551-
if [ -d '/opt/rh/devtoolset-7' ] ; then
552-
set +eo pipefail
553-
source scl_source enable devtoolset-7
554-
set -eo pipefail
555-
fi
556-
set -u
557-
prefix="<< parameters.prefix >>"
558-
mkdir -vp "${prefix}"
559548
command -v switch-php && switch-php "${PHP_VERSION}-zts"
560549
cd profiling
561-
echo "${CARGO_TARGET_DIR}"
562550
cargo build --release
563-
cd -
564551
cp -v "${CARGO_TARGET_DIR}/release/libdatadog_php_profiling.so" "${prefix}/datadog-profiling-zts.so"
565552
566553
executors:
@@ -2776,14 +2763,8 @@ jobs:
27762763
cp -v "${run_tests_php}" .
27772764
export TEST_PHP_EXECUTABLE=$(which php)
27782765
php run-tests.php -d "extension=/mnt/ramdisk/cargo/release/libdatadog_php_profiling.so" --show-diff -g "FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP" "phpt"
2779-
- run:
2780-
name: phpt tests ZTS
2781-
command: |
2782-
set -u
2766+
cd ..
27832767
command -v switch-php && switch-php "${PHP_VERSION}-zts"
2784-
set -e
2785-
libdir="/tmp/datadog-profiling"
2786-
cd profiling
27872768
cargo build --release --all-features
27882769
cd tests
27892770
# don't anticipate there being more than one

profiling/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use std::path::PathBuf;
66
use std::process::Command;
77

88
fn main() {
9+
println!("cargo:rerun-if-changed=NULL");
910
let php_config_includes_output = Command::new("php-config")
1011
.arg("--includes")
1112
.output()

0 commit comments

Comments
 (0)