NH-82783: exclude duplicated class

solarwinds · Jul 29, 2024 · 8cca2e0 · 8cca2e0
1 parent e17e26b
commit 8cca2e0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -52,21 +52,37 @@ jobs:
           response=$(curl -fs \
             -H "Authorization: Bearer $SIGN_PATH_API_TOKEN" \
             -F "ProjectSlug=$SIGN_PATH_PROJECT_SLUG" \
+            -F "ArtifactConfigurationSlug=$SIGN_PATH_ARTIFACT_SLUG" \
             -F "SigningPolicySlug=$SIGN_PATH_SIGNING_POLICY" \
             -F "Artifact=@agent/build/libs/solarwinds-apm-agent.jar" \
             https://app.signpath.io/API/v1/$SIGN_PATH_ORG_ID/SigningRequests)
+          
           SIGNING_REQUEST_ID=$(echo "$response" | jq -r '.signingRequestId')
-          echo "request-id -> $SIGNING_REQUEST_ID"
           
+          state=""
+          while [[ "$state" != "true" ]]
+          do
+            response=$(curl -sSL \
+              -H "Authorization: Bearer $SIGN_PATH_API_TOKEN" \
+              https://app.signpath.io/API/v1/$SIGN_PATH_ORG_ID/SigningRequests/$SIGNING_REQUEST_ID)
+          
+            state=$(echo "$response" | jq -r ".isFinalStatus")
+            status_state=$(echo "$response" | jq -r ".status")
+            echo "Status -> $status_state"
+          
+            sleep 5
+          done
+  
           curl -fs \
-            -o agent/build/libs/solarwinds-apm-agent.jar \
+            -o agent/build/libs/solarwinds-apm-agent-signed.jar \
             -H "Authorization: Bearer $SIGN_PATH_API_TOKEN" \
             https://app.signpath.io/API/v1/$SIGN_PATH_ORG_ID/SigningRequests/$SIGNING_REQUEST_ID/SignedArtifact
         env:
           SIGN_PATH_API_TOKEN: ${{ secrets.SIGN_PATH_API_TOKEN }}
           SIGN_PATH_PROJECT_SLUG: ${{ secrets.SIGN_PATH_PROJECT_SLUG }}
           SIGN_PATH_SIGNING_POLICY: ${{ secrets.SIGN_PATH_SIGNING_POLICY }}
           SIGN_PATH_ORG_ID: ${{ secrets.SIGN_PATH_ORG_ID }}
+          SIGN_PATH_ARTIFACT_SLUG: ${{ secrets.SIGN_PATH_ARTIFACT_SLUG }}
 
       - name: Copy to S3
         run: |

diff --git a/agent/build.gradle b/agent/build.gradle
@@ -123,6 +123,8 @@ tasks {
     }
     exclude("**/module-info.class")
     exclude("inst/com/solarwinds/opentelemetry/core/**")
+    exclude("com/solarwinds/joboe/shaded/google/errorprone/annotations/**")
+
     relocatePackages(it)
 
     manifest {