Merge Sonar job into ccov job (#3621)

* Merge Sonar job into ccov job

* Modernize Sonar Scanner invocation

* Don't run if SONAR_TOKEN not available

Author: EzraBrooks

.github/workflows/ci.yaml

@@ -67,6 +67,7 @@ jobs:
       CC: ${{ matrix.env.CLANG_TIDY && 'clang' }}
       CXX: ${{ matrix.env.CLANG_TIDY && 'clang++' }}
       ADDITIONAL_DEBS: lld
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
     name: ${{ matrix.env.IMAGE }}${{ matrix.env.CCOV && ' + ccov' || ''}}${{ matrix.env.IKFAST_TEST && ' + ikfast' || ''}}${{ matrix.env.CLANG_TIDY && (github.event_name != 'workflow_dispatch' && ' + clang-tidy (delta)' || ' + clang-tidy (all)') || '' }}
     runs-on: ubuntu-latest
@@ -177,6 +178,10 @@ jobs:
         with:
           name: clang-tidy
           path: ${{ env.BASEDIR }}/target_ws/src/$(basename $(pwd))
+      - name: SonarQube Scan
+        # Don't run if SONAR_TOKEN is not set (i.e. PR job from a fork)
+        if: matrix.env.CCOV && steps.ici.outputs.target_test_results == '0' && env.SONAR_TOKEN != ''
+        uses: SonarSource/sonarqube-scan-action@v6.0.0
       - name: Prepare target_ws for cache
         if: always() && !matrix.env.CCOV
         run: |
@@ -190,7 +195,5 @@ jobs:
     uses: ./.github/workflows/docker_lint.yaml
   format:
     uses: ./.github/workflows/format.yaml
-  sonar:
-    uses: ./.github/workflows/sonar.yaml
   tutorial_docker:
     uses: ./.github/workflows/tutorial_docker.yaml