From bfa701d27fc3a39c76aa41abe417013de6288e11 Mon Sep 17 00:00:00 2001
From: Zach Montoya <zach.montoya@datadoghq.com>
Date: Thu, 7 Mar 2024 11:27:57 -0800
Subject: [PATCH] Update run-in-docker GH action and use it for ARM64 workflow

---
 .github/actions/run-in-docker/action.yml | 20 ++++++++++++++------
 .github/workflows/build.yml              | 19 +++++++------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.github/actions/run-in-docker/action.yml b/.github/actions/run-in-docker/action.yml
index 2f2f52203962..576af4b4a203 100644
--- a/.github/actions/run-in-docker/action.yml
+++ b/.github/actions/run-in-docker/action.yml
@@ -3,30 +3,38 @@ description: 'Run command in docker'
 
 inputs:
   command:
-    descritption: 'Command to run'
+    description: 'Command to run'
     default: ''
 
   baseImage:
     description: 'Image to use'
     default: 'centos7'
 
+  target:
+    description: 'Target to run'
+    default: 'builder'
+
+  docker_elevation_argument:
+    description: 'Command to add elevation (if needed)'
+    default: ''
+
 runs:
   using: "composite"
   steps:
     - name: Build on ${{ inputs.baseImage }} Docker image
       shell: bash
       run: |
-        docker build \
+        ${{ inputs.docker_elevation_argument }} docker build \
           --build-arg DOTNETSDK_VERSION=8.0.100 \
-          --tag dd-trace-dotnet/${{ inputs.baseImage }}-builder \
-          --target builder \
+          --tag dd-trace-dotnet/${{ inputs.baseImage }}-${{ inputs.target }} \
+          --target ${{ inputs.target }} \
           --file "${GITHUB_WORKSPACE}/tracer/build/_build/docker/${{ inputs.baseImage }}.dockerfile" \
           "${GITHUB_WORKSPACE}/tracer/build/_build"
 
     - name: Run '${{ inputs.command }}' in Docker
       shell: bash
       run: |
-        docker run --rm \
+        ${{ inputs.docker_elevation_argument }} docker run --rm \
             --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project \
             --env NugetPackageDirectory=/project/packages \
             --env tracerHome=/project/shared/bin/monitoring-home/tracer \
@@ -37,5 +45,5 @@ runs:
             --env TestAllPackageVersions=false \
             --env IncludeMinorPackageVersions=false \
             --env NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true \
-            dd-trace-dotnet/${{ inputs.baseImage }}-builder \
+            dd-trace-dotnet/${{ inputs.baseImage }}-${{ inputs.target }} \
             dotnet /build/bin/Debug/_build.dll ${{ inputs.command }}
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 340fd4b8b3d9..dc257330c01a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,12 +5,8 @@ on:
   workflow_dispatch:
 
 env:
-  sdkVersion: 8.0.100
-  build: true
   target: builder
   baseImage: debian
-  command: "Clean BuildTracerHome BuildNativeLoader ExtractDebugInfoLinux"
-  retryCountForRunCommand: 1
 
 jobs:
   build:
@@ -29,11 +25,10 @@ jobs:
           curl -fsSL https://get.docker.com -o get-docker.sh
           sudo sh get-docker.sh
 
-      - name: Build debian Docker image
-        run: |
-          sudo docker build \
-            --build-arg DOTNETSDK_VERSION=$sdkVersion \
-            --tag dd-trace-dotnet/${{ env.baseImage }}-${{ env.target }}:$sdkVersion \
-            --target ${{ env.target }} \
-            --file ./tracer/build/_build/docker/${{ env.baseImage }}.dockerfile \
-            ./tracer/build/_build
+      - name: Build and run debian Docker image
+        uses: ./.github/actions/run-in-docker
+        with:
+          baseImage: ${{ env.baseImage }}
+          target: ${{ env.target }}
+          docker_elevation_argument: sudo
+          command: 'Clean BuildTracerHome BuildNativeLoader ExtractDebugInfoLinux'