From e1167c393b16b25c9c09848a3d263aa7f1064352 Mon Sep 17 00:00:00 2001 From: Mateusz Lach Date: Thu, 8 Feb 2024 08:18:42 +0100 Subject: [PATCH 1/3] workflow fix --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b0c4f559..0a0a688b6 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,7 +424,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} \ From 81092aec097821a65a28ca9960efa7bb52af2799 Mon Sep 17 00:00:00 2001 From: Mateusz Lach Date: Fri, 9 Feb 2024 13:26:48 +0100 Subject: [PATCH 2/3] build nuke in same container --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a0a688b6..c4db5dfaa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -429,7 +429,7 @@ jobs: --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 From ba326029babb63410a8da16ff89a131bafba803d Mon Sep 17 00:00:00 2001 From: Mateusz Lach Date: Fri, 9 Feb 2024 13:55:06 +0100 Subject: [PATCH 3/3] container integration tests fix --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: