more ci fixes

DataDog · Dec 31, 2024 · 286e02f · 286e02f
1 parent 62b32df
commit 286e02f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -141,7 +141,7 @@ jobs:
         env:
           RUSTFLAGS: "${{ matrix.flags }}"
         run: |
-          cargo run --bin release --features profiling,telemetry,data-pipeline,symbolizer,crashtracker --release -- --out $LIBDD_OUTPUT_FOLDER
+          cargo run --bin release --features profiling,telemetry,data-pipeline,symbolizer,crashtracker,datadog-library-config-ffi --release -- --out $LIBDD_OUTPUT_FOLDER
 
       - name: 'Publish libdatadog'
         uses: actions/upload-artifact@v4

diff --git a/builder/Cargo.toml b/builder/Cargo.toml
@@ -13,6 +13,7 @@ profiling = []
 telemetry = []
 data-pipeline = []
 symbolizer = []
+datadog-library-config-ffi = []
 
 [lib]
 bench = false

diff --git a/builder/src/profiling.rs b/builder/src/profiling.rs
@@ -37,6 +37,8 @@ impl Profiling {
         headers.push("data-pipeline.h");
         #[cfg(feature = "symbolizer")]
         headers.push("blazesym.h");
+        #[cfg(feature = "datadog-library-config-ffi")]
+        headers.push("library-config.h");
 
         let mut origin_path: PathBuf = [&self.source_include, "dummy.h"].iter().collect();
         let mut target_path: PathBuf = [&self.target_include, "dummy.h"].iter().collect();

diff --git a/tools/docker/Dockerfile.build b/tools/docker/Dockerfile.build
@@ -160,7 +160,7 @@ RUN cargo build --lib --workspace --exclude builder
 RUN cargo build --release --lib --workspace --exclude builder
 
 COPY ./ ./
-RUN cargo run --bin release --features profiling,telemetry,data-pipeline,symbolizer,crashtracker --release -- --out /build/output
+RUN cargo run --bin release --features profiling,telemetry,data-pipeline,symbolizer,crashtracker,datadog-library-config-ffi --release -- --out /build/output
 
 FROM scratch as ffi_build_output