testing

rsksmart · Oct 14, 2024 · d0f8ece · d0f8ece
1 parent ec0a0ab
commit d0f8ece
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -104,18 +104,23 @@ jobs:
           GH_PR_HEAD_REF: ${{ github.head_ref }}
           GH_REF: ${{ github.ref }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          IS_FORK: ${{ github.event.pull_request.head.repo.fork }}  # Capture the fork status
         run: |
-          if [ "$GH_EVENT" = pull_request ] && [ "${{ github.event.pull_request.head.repo.fork }}" != "true" ]; then
-            ./gradlew -Dorg.gradle.jvmargs=-Xmx5g sonarqube --no-daemon -x build -x test \
-              -Dsonar.pullrequest.base="$GH_PR_BASE_REF" \
-              -Dsonar.pullrequest.branch="$GH_PR_HEAD_REF" \
-              -Dsonar.pullrequest.key="$GH_PR_NUMBER" \
-              -Dsonar.organization=rsksmart \
-              -Dsonar.projectKey=rskj \
-              -Dsonar.host.url="https://sonarcloud.io" \
-              -Dsonar.junit.reportPaths=rskj-core/build/test-results/ \
-              -Dsonar.coverage.jacoco.xmlReportPaths=rskj-core/build/reports/jacoco/test/jacocoTestReport.xml \
-              -Dsonar.token="$SONAR_TOKEN"
+          if [ "$GH_EVENT" = "pull_request" ]; then
+            if [ "$IS_FORK" != "true" ]; then
+              ./gradlew -Dorg.gradle.jvmargs=-Xmx5g sonarqube --no-daemon -x build -x test \
+                -Dsonar.pullrequest.base="$GH_PR_BASE_REF" \
+                -Dsonar.pullrequest.branch="$GH_PR_HEAD_REF" \
+                -Dsonar.pullrequest.key="$GH_PR_NUMBER" \
+                -Dsonar.organization=rsksmart \
+                -Dsonar.projectKey=rskj \
+                -Dsonar.host.url="https://sonarcloud.io" \
+                -Dsonar.junit.reportPaths=rskj-core/build/test-results/ \
+                -Dsonar.coverage.jacoco.xmlReportPaths=rskj-core/build/reports/jacoco/test/jacocoTestReport.xml \
+                -Dsonar.token="$SONAR_TOKEN"
+            else
+              echo "Skipping SonarQube analysis for pull request from a forked repo."
+            fi
           else
             ./gradlew -Dorg.gradle.jvmargs=-Xmx5g sonarqube --no-daemon -x build -x test \
               -Dsonar.branch.name="$GH_REF" \