Update workflows

.github/workflows/sonarqube.yaml

@@ -1,33 +1,36 @@
-name: SonarCloud
+name: 'SonarCloud'
+
 on:
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened]
+
+env:
+  TARGETS: f7
+  DEFAULT_TARGET: f7
+
 jobs:
-  build:
-    name: Build and analyze
+  analyze:
     runs-on: ubuntu-latest
     env:
       SONAR_SCANNER_VERSION: 4.7.0.2747
       SONAR_SERVER_URL: "https://sonarcloud.io"
       BUILD_WRAPPER_OUT_DIR: "$HOME/.sonar/build_wrapper_output" # Directory where build-wrapper output will be placed
       FBT_NO_SYNC: "true"
-      TARGETS: f7
-      DEFAULT_TARGET: f7
     steps:
-      - name: 'Decontaminate previous build leftovers'
-        run: |
-          if [ -d .git ]; then
-            git submodule status || git checkout "$(git rev-list --max-parents=0 HEAD | tail -n 1)"
-          fi
-      - uses: actions/checkout@v2
+
+      - name: 'Checkout code'
+        uses: actions/checkout@v3
         with:
+          submodules: 'recursive'  # FBT_NO_SYNC is on, get submodules now
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-          submodules: 'recursive'
+          ref: ${{ github.event.pull_request.head.sha }}
+
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
           java-version: 11
+
       - name: Download and set up sonar-scanner
         env:
           SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
@@ -36,6 +39,7 @@ jobs:
           curl -sSLo $HOME/.sonar/sonar-scanner.zip ${{ env.SONAR_SCANNER_DOWNLOAD_URL }}
           unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
           echo "$HOME/.sonar/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> $GITHUB_PATH
+
       - name: Download and set up build-wrapper
         env:
           BUILD_WRAPPER_DOWNLOAD_URL: ${{ env.SONAR_SERVER_URL }}/static/cpp/build-wrapper-linux-x86.zip
@@ -43,10 +47,16 @@ jobs:
           curl -sSLo $HOME/.sonar/build-wrapper-linux-x86.zip ${{ env.BUILD_WRAPPER_DOWNLOAD_URL }}
           unzip -o $HOME/.sonar/build-wrapper-linux-x86.zip -d $HOME/.sonar/
           echo "$HOME/.sonar/build-wrapper-linux-x86" >> $GITHUB_PATH
+
       - name: Run build-wrapper
         run: |
-          mkdir $HOME/.sonar/build_wrapper_output
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} ./sonar-build
+          mkdir ${{ env.BUILD_WRAPPER_OUT_DIR }}
+          set -e
+          for TARGET in ${TARGETS}; do
+            TARGET="$(echo "${TARGET}" | sed 's/f//')"; \
+            build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} ./sonar-build "./fbt TARGET_HW=$TARGET updater_package"
+          done
+
       - name: Run sonar-scanner
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}