Fix 3

SonarSource · Jun 27, 2024 · 8afc762 · 8afc762
1 parent b76bee2
commit 8afc762
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -340,12 +340,14 @@ jobs:
           test ! -z "${SONAR_SCANNER_VERSION}"
 
           echo "- Check windows sonar-scanner URLs:"
-          grep "sonar-scanner-url-windows=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-windows.zip" output
-          grep -e "^sonar-scanner-sha-windows=[0-9A-Fa-f]\+$" output
+          grep "sonar-scanner-url-windows-x64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-windows-x64.zip" output
+          grep -e "^sonar-scanner-sha-windows-x64=[0-9A-Fa-f]\+$" output
 
           echo "- Check linux sonar-scanner URLs:"
-          grep "sonar-scanner-url-linux=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux.zip" output
-          grep -e "^sonar-scanner-sha-linux=[0-9A-Fa-f]\+$" output
+          grep "sonar-scanner-url-linux-x64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux-x64.zip" output
+          grep -e "^sonar-scanner-sha-linux-x64=[0-9A-Fa-f]\+$" output
+          grep "sonar-scanner-url-linux-aarch64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux-aarch64.zip" output
+          grep -e "^sonar-scanner-sha-linux-aarch64=[0-9A-Fa-f]\+$" output
 
           echo "- Check macosx sonar-scanner URLs:"
           grep "sonar-scanner-url-macosx=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-macosx.zip" output

diff --git a/scripts/configure_paths.sh b/scripts/configure_paths.sh
@@ -26,8 +26,8 @@ case ${OS} in
       ARM64)
         BUILD_WRAPPER_SUFFIX="linux-aarch64"
         BUILD_WRAPPER_NAME="build-wrapper-linux-aarch64"
-        SONAR_SCANNER_URL="${SONAR_SCANNER_URL_AARCH64}"
-        SONAR_SCANNER_SHA="${SONAR_SCANNER_SHA_AARCH64}"
+        SONAR_SCANNER_URL="${SONAR_SCANNER_URL_LINUX_AARCH64}"
+        SONAR_SCANNER_SHA="${SONAR_SCANNER_SHA_LINUX_AARCH64}"
         SONAR_SCANNER_SUFFIX="linux-aarch64"
         ;;
     esac