From 8afc762fba50a3df1532ad9a8f90b20e6cb7e3ae Mon Sep 17 00:00:00 2001 From: Vincenzo Pellegrini Date: Thu, 27 Jun 2024 10:36:06 +0200 Subject: [PATCH] Fix 3 --- .github/workflows/tests.yml | 10 ++++++---- scripts/configure_paths.sh | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bb69cca..de25851 100644 --- 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 index 3cf170c..3507892 100755 --- 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