Replace native code from ubuntu by Centos

Kielek · Oct 13, 2023 · 0e1cbb6 · 0e1cbb6
1 parent 8857658
commit 0e1cbb6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -73,7 +73,7 @@ jobs:
     - name: Publish native library Linux build
       uses: actions/upload-artifact@v3.1.3
       with:
-        name: bin-${{ matrix.base-image }}
+        name: bin-${{ matrix.base-image }}-native
         path: bin/tracer-home
       if: (${{ job.status }} != 'cancelled')
       continue-on-error: true
diff --git a/.github/workflows/build-nuget-packages.yml b/.github/workflows/build-nuget-packages.yml
@@ -46,11 +46,11 @@ jobs:
           name: bin-windows-2022
           path: bin/ci-artifacts/bin-windows-2022
 
-      - name: Download CentOS Artifacts from build job
+      - name: Download ubuntu Artifacts from build job
         uses: actions/download-artifact@v3.0.2
         with:
-          name: bin-centos
-          path: bin/ci-artifacts/bin-centos
+          name: bin-ubuntu-20.04
+          path: bin/ci-artifacts/bin-ubuntu-20.04
 
       - name: Download Alpine Artifacts from build job
         uses: actions/download-artifact@v3.0.2

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -49,6 +49,17 @@ jobs:
 
       - run: ./build.cmd BuildWorkflow --no-restore ${{ steps.nuget-cache.outputs.cache-hit != 'true' }}
 
+      - name: Download native CentOS Artifacts from build job
+        if: ${{ matrix.machine == 'ubuntu-20.04' }}
+        uses: actions/download-artifact@v3.0.2
+        with:
+          name: bin-centos-native
+          path: bin/ci-artifacts/bin-centos-native
+      - name: Replace Ubuntu native code by Centos artifacts
+        run: |
+          rm ./bin/tracer-home/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so
+          cp ./bin/ci-artifacts/bin-centos-native/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so ./bin/tracer-home/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so
+        if: ${{ matrix.machine == 'ubuntu-20.04' }}
       - run: brew install coreutils
         if: ${{ runner.os == 'macOS' }}
       - name: Create test directory

diff --git a/build/Build.NuGet.Steps.cs b/build/Build.NuGet.Steps.cs
@@ -51,7 +51,7 @@ partial class Build
             var requiredArtifacts = new string[]
             {
                 "bin-alpine/linux-musl-x64",
-                "bin-centos/linux-x64",
+                "bin-ubuntu-20.04/linux-x64",
                 "bin-macos-11/osx-x64",
                 "bin-windows-2022/win-x64",
                 "bin-windows-2022/win-x86"