diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7ec2afa..4416095 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -163,7 +163,7 @@ jobs: grep "build-wrapper-dir=install-directory/build-wrapper-linux-x86" output grep "build-wrapper-bin=install-directory/build-wrapper-linux-x86/build-wrapper-linux-x86-64" output - - name: macOSX + - name: macOSX_X64 shell: bash env: OS: 'macOS' @@ -183,6 +183,26 @@ jobs: grep "build-wrapper-dir=install-directory/build-wrapper-macosx-x86" output grep "build-wrapper-bin=install-directory/build-wrapper-macosx-x86/build-wrapper-macosx-x86" output + - name: macOSX_ARM64 + shell: bash + env: + OS: 'macOS' + ARCH: 'ARM64' + run: | + ./scripts/configure_paths.sh > output + grep -v "::error::" output + + echo "- Check sonar-scanner:" + grep "sonar-scanner-url=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-macosx.zip" output + grep "sonar-scanner-sha=DOWNLOAD-SHA-MACOSX" output + grep "sonar-scanner-dir=install-directory/sonar-scanner-vX.Y.Z.MMMM-macosx" output + grep "sonar-scanner-bin=install-directory/sonar-scanner-vX.Y.Z.MMMM-macosx/bin/sonar-scanner" output + + echo "- Check build-wrapper:" + grep "build-wrapper-url=http://sonar-host.com/static/cpp/build-wrapper-macosx-x86.zip" output + grep "build-wrapper-dir=install-directory/build-wrapper-macosx-x86" output + grep "build-wrapper-bin=install-directory/build-wrapper-macosx-x86/build-wrapper-macosx-x86" output + - name: Unssuported OS shell: bash env: diff --git a/scripts/configure_paths.sh b/scripts/configure_paths.sh index 8a8ed2b..9e06ddb 100755 --- a/scripts/configure_paths.sh +++ b/scripts/configure_paths.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [[ ${ARCH} != "X64" ]]; then +if [[ ${ARCH} != "X64" && ! ( ${OS} == "macOS" && ${ARCH} == "ARM64" ) ]]; then echo "::error::Architecture '${ARCH}' is unsupported by build-wrapper" exit 1 fi