From 3cfbb3486f8be54da690a0f091b395c836308bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20=C5=81ach?= <mateusza@splunk.com>
Date: Mon, 12 Feb 2024 07:39:23 +0100
Subject: [PATCH] [CI] workflow fix (#764)

---
 .github/workflows/ci.yml | 10 +++++-----
 docker-compose.yml       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0b0c4f559..c4db5dfaa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -151,7 +151,7 @@ jobs:
       run: |
         docker run --rm \
           --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project \
-          --env NugetPackageDirectory=/project/$(relativeNugetPackageDirectory) \
+          --env NugetPackageDirectory=/project/${relativeNugetPackageDirectory} \
           --env tracerHome=/project/${relativeTracerHome} \
           --env artifacts=/project/${relativeArtifacts} \
           --env SIGNALFX_CLR_ENABLE_NGEN=${SIGNALFX_CLR_ENABLE_NGEN} \
@@ -226,7 +226,7 @@ jobs:
       run: |
         docker run --rm \
           --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project \
-          --env NugetPackageDirectory=/project/$(relativeNugetPackageDirectory) \
+          --env NugetPackageDirectory=/project/${relativeNugetPackageDirectory} \
           --env tracerHome=/project/${relativeTracerHome} \
           --env artifacts=/project/${relativeArtifacts} \
           --env SIGNALFX_CLR_ENABLE_NGEN=${SIGNALFX_CLR_ENABLE_NGEN} \
@@ -301,7 +301,7 @@ jobs:
       run: |
         docker run --rm \
           --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project \
-          --env NugetPackageDirectory=/project/$(relativeNugetPackageDirectory) \
+          --env NugetPackageDirectory=/project/${relativeNugetPackageDirectory} \
           --env tracerHome=/project/${relativeTracerHome} \
           --env artifacts=/project/${relativeArtifacts} \
           --env SIGNALFX_CLR_ENABLE_NGEN=${SIGNALFX_CLR_ENABLE_NGEN} \
@@ -424,12 +424,12 @@ jobs:
       run: |
         docker run --rm \
           --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project \
-          --env NugetPackageDirectory=/project/$(relativeNugetPackageDirectory) \
+          --env NugetPackageDirectory=/project/${relativeNugetPackageDirectory} \
           --env tracerHome=/project/${relativeTracerHome} \
           --env artifacts=/project/${relativeArtifacts} \
           --env SIGNALFX_CLR_ENABLE_NGEN=${SIGNALFX_CLR_ENABLE_NGEN} \
           dd-trace-dotnet/${{ matrix.base-image }}-builder \
-          dotnet /build/bin/Debug/_build.dll Info Clean BuildTracerHome BuildLinuxIntegrationTests -Framework ${{ matrix.framework }}
+          /bin/sh -c 'git config --global --add safe.directory /project && ./tracer/build.sh Info Clean BuildTracerHome BuildLinuxIntegrationTests -Framework ${{ matrix.framework }}'
     - name: Build dependencies
       run: docker-compose build --build-arg SERVERLESS_ARTIFACTS_PATH=.${relativeTracerHome} StartDependencies
     - name: Start dependencies
diff --git a/docker-compose.yml b/docker-compose.yml
index f9bd6d22a..4ab54f6da 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -512,7 +512,7 @@ services:
       args:
         - DOTNETSDK_VERSION=${dotnetCoreSdkLatestVersion:-7.0.101}
     image: dd-trace-dotnet/${baseImage:-centos7}-tester
-    command: dotnet /build/bin/Debug/_build.dll RunLinuxIntegrationTests --framework ${framework:-netcoreapp3.1} --code-coverage
+    command: /bin/sh -c './tracer/build.sh RunLinuxIntegrationTests --framework ${framework:-netcoreapp3.1} --code-coverage'
     volumes:
       - ./:/project
     environment: