Skip to content

Commit 1748dd0

Browse files
friedbyalicefriedbyalice
authored
SCCPPGHA-8 Make use of the Linux ARM64 CLI Scanner (#59)
1 parent e25edae commit 1748dd0

File tree

5 files changed

+111
-82
lines changed

5 files changed

+111
-82
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 56 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,16 @@ jobs:
112112
INSTALL_PATH: 'install-directory'
113113
SONAR_HOST_URL: 'http://sonar-host.com'
114114
SONAR_SCANNER_VERSION: 'vX.Y.Z.MMMM'
115-
SONAR_SCANNER_URL_WINDOWS: 'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-windows.zip'
116-
SONAR_SCANNER_SHA_WINDOWS: 'DOWNLOAD-SHA-WINDOWS'
117-
SONAR_SCANNER_URL_LINUX: 'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-linux.zip'
118-
SONAR_SCANNER_SHA_LINUX: 'DOWNLOAD-SHA-LINUX'
119-
SONAR_SCANNER_URL_MACOSX: 'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-macosx.zip'
120-
SONAR_SCANNER_SHA_MACOSX: 'DOWNLOAD-SHA-MACOSX'
121-
SONAR_SCANNER_URL_UNIVERSAL: 'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM.zip'
122-
SONAR_SCANNER_SHA_UNIVERSAL: 'DOWNLOAD-SHA'
115+
SONAR_SCANNER_URL_WINDOWS_X64: 'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-windows-x64.zip'
116+
SONAR_SCANNER_SHA_WINDOWS_X64: 'DOWNLOAD-SHA-WINDOWS-X64'
117+
SONAR_SCANNER_URL_LINUX_X64: 'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-linux-x64.zip'
118+
SONAR_SCANNER_SHA_LINUX_X64: 'DOWNLOAD-SHA-LINUX-X64'
119+
SONAR_SCANNER_URL_LINUX_AARCH64: 'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-linux-aarch64.zip'
120+
SONAR_SCANNER_SHA_LINUX_AARCH64: 'DOWNLOAD-SHA-LINUX-AARCH64'
121+
SONAR_SCANNER_URL_MACOSX_X64: 'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-macosx-x64.zip'
122+
SONAR_SCANNER_SHA_MACOSX_X64: 'DOWNLOAD-SHA-MACOSX-X64'
123+
SONAR_SCANNER_URL_MACOSX_AARCH64: 'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-macosx-aarch64.zip'
124+
SONAR_SCANNER_SHA_MACOSX_AARCH64: 'DOWNLOAD-SHA-MACOSX-AARCH64'
123125
steps:
124126
- uses: actions/checkout@v3
125127
with:
@@ -135,10 +137,10 @@ jobs:
135137
grep -v "::error::" output
136138
137139
echo "- Check sonar-scanner:"
138-
grep "sonar-scanner-url=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-windows.zip" output
139-
grep "sonar-scanner-sha=DOWNLOAD-SHA-WINDOWS" output
140-
grep "sonar-scanner-dir=install-directory/sonar-scanner-vX.Y.Z.MMMM-windows" output
141-
grep "sonar-scanner-bin=install-directory/sonar-scanner-vX.Y.Z.MMMM-windows/bin/sonar-scanner.bat" output
140+
grep "sonar-scanner-url=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-windows-x64.zip" output
141+
grep "sonar-scanner-sha=DOWNLOAD-SHA-WINDOWS-X64" output
142+
grep "sonar-scanner-dir=install-directory/sonar-scanner-vX.Y.Z.MMMM-windows-x64" output
143+
grep "sonar-scanner-bin=install-directory/sonar-scanner-vX.Y.Z.MMMM-windows-x64/bin/sonar-scanner.bat" output
142144
143145
echo "- Check build-wrapper:"
144146
grep "build-wrapper-url=http://sonar-host.com/static/cpp/build-wrapper-win-x86.zip" output
@@ -155,10 +157,10 @@ jobs:
155157
grep -v "::error::" output
156158
157159
echo "- Check sonar-scanner:"
158-
grep "sonar-scanner-url=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-linux.zip" output
159-
grep "sonar-scanner-sha=DOWNLOAD-SHA-LINUX" output
160-
grep "sonar-scanner-dir=install-directory/sonar-scanner-vX.Y.Z.MMMM-linux" output
161-
grep "sonar-scanner-bin=install-directory/sonar-scanner-vX.Y.Z.MMMM-linux/bin/sonar-scanner" output
160+
grep "sonar-scanner-url=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-linux-x64.zip" output
161+
grep "sonar-scanner-sha=DOWNLOAD-SHA-LINUX-X64" output
162+
grep "sonar-scanner-dir=install-directory/sonar-scanner-vX.Y.Z.MMMM-linux-x64" output
163+
grep "sonar-scanner-bin=install-directory/sonar-scanner-vX.Y.Z.MMMM-linux-x64/bin/sonar-scanner" output
162164
163165
echo "- Check build-wrapper:"
164166
grep "build-wrapper-url=http://sonar-host.com/static/cpp/build-wrapper-linux-x86.zip" output
@@ -175,10 +177,10 @@ jobs:
175177
grep -v "::error::" output
176178
177179
echo "- Check sonar-scanner:"
178-
grep "sonar-scanner-url=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM.zip" output
179-
grep "sonar-scanner-sha=DOWNLOAD-SHA" output
180-
grep "sonar-scanner-dir=install-directory/sonar-scanner-vX.Y.Z.MMMM" output
181-
grep "sonar-scanner-bin=install-directory/sonar-scanner-vX.Y.Z.MMMM/bin/sonar-scanner" output
180+
grep "sonar-scanner-url=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-linux-aarch64.zip" output
181+
grep "sonar-scanner-sha=DOWNLOAD-SHA-LINUX-AARCH64" output
182+
grep "sonar-scanner-dir=install-directory/sonar-scanner-vX.Y.Z.MMMM-linux-aarch64" output
183+
grep "sonar-scanner-bin=install-directory/sonar-scanner-vX.Y.Z.MMMM-linux-aarch64/bin/sonar-scanner" output
182184
183185
echo "- Check build-wrapper:"
184186
grep "build-wrapper-url=http://sonar-host.com/static/cpp/build-wrapper-linux-aarch64.zip" output
@@ -195,10 +197,10 @@ jobs:
195197
grep -v "::error::" output
196198
197199
echo "- Check sonar-scanner:"
198-
grep "sonar-scanner-url=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-macosx.zip" output
199-
grep "sonar-scanner-sha=DOWNLOAD-SHA-MACOSX" output
200-
grep "sonar-scanner-dir=install-directory/sonar-scanner-vX.Y.Z.MMMM-macosx" output
201-
grep "sonar-scanner-bin=install-directory/sonar-scanner-vX.Y.Z.MMMM-macosx/bin/sonar-scanner" output
200+
grep "sonar-scanner-url=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-macosx-x64.zip" output
201+
grep "sonar-scanner-sha=DOWNLOAD-SHA-MACOSX-X64" output
202+
grep "sonar-scanner-dir=install-directory/sonar-scanner-vX.Y.Z.MMMM-macosx-x64" output
203+
grep "sonar-scanner-bin=install-directory/sonar-scanner-vX.Y.Z.MMMM-macosx-x64/bin/sonar-scanner" output
202204
203205
echo "- Check build-wrapper:"
204206
grep "build-wrapper-url=http://sonar-host.com/static/cpp/build-wrapper-macosx-x86.zip" output
@@ -215,10 +217,10 @@ jobs:
215217
grep -v "::error::" output
216218
217219
echo "- Check sonar-scanner:"
218-
grep "sonar-scanner-url=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-macosx.zip" output
219-
grep "sonar-scanner-sha=DOWNLOAD-SHA-MACOSX" output
220-
grep "sonar-scanner-dir=install-directory/sonar-scanner-vX.Y.Z.MMMM-macosx" output
221-
grep "sonar-scanner-bin=install-directory/sonar-scanner-vX.Y.Z.MMMM-macosx/bin/sonar-scanner" output
220+
grep "sonar-scanner-url=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-vX.Y.Z.MMMM-macosx-aarch64.zip" output
221+
grep "sonar-scanner-sha=DOWNLOAD-SHA-MACOSX-AARCH64" output
222+
grep "sonar-scanner-dir=install-directory/sonar-scanner-vX.Y.Z.MMMM-macosx-aarch64" output
223+
grep "sonar-scanner-bin=install-directory/sonar-scanner-vX.Y.Z.MMMM-macosx-aarch64/bin/sonar-scanner" output
222224
223225
echo "- Check build-wrapper:"
224226
grep "build-wrapper-url=http://sonar-host.com/static/cpp/build-wrapper-macosx-x86.zip" output
@@ -338,25 +340,44 @@ jobs:
338340
test ! -z "${SONAR_SCANNER_VERSION}"
339341
340342
echo "- Check windows sonar-scanner URLs:"
341-
grep "sonar-scanner-url-windows=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-windows.zip" output
342-
grep -e "^sonar-scanner-sha-windows=[0-9A-Fa-f]\+$" output
343+
grep "sonar-scanner-url-windows-x64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-windows-x64.zip" output
344+
grep -e "^sonar-scanner-sha-windows-x64=[0-9A-Fa-f]\+$" output
343345
344346
echo "- Check linux sonar-scanner URLs:"
345-
grep "sonar-scanner-url-linux=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux.zip" output
346-
grep -e "^sonar-scanner-sha-linux=[0-9A-Fa-f]\+$" output
347+
grep "sonar-scanner-url-linux-x64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux-x64.zip" output
348+
grep -e "^sonar-scanner-sha-linux-x64=[0-9A-Fa-f]\+$" output
349+
grep "sonar-scanner-url-linux-aarch64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux-aarch64.zip" output
350+
grep -e "^sonar-scanner-sha-linux-aarch64=[0-9A-Fa-f]\+$" output
347351
348352
echo "- Check macosx sonar-scanner URLs:"
349-
grep "sonar-scanner-url-macosx=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-macosx.zip" output
350-
grep -e "^sonar-scanner-sha-macosx=[0-9A-Fa-f]\+$" output
353+
grep "sonar-scanner-url-macosx-x64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-macosx-x64.zip" output
354+
grep -e "^sonar-scanner-sha-macosx-x64=[0-9A-Fa-f]\+$" output
355+
grep "sonar-scanner-url-macosx-aarch64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-macosx-aarch64.zip" output
356+
grep -e "^sonar-scanner-sha-macosx-aarch64=[0-9A-Fa-f]\+$" output
351357
352358
output-test:
353359
name: Test action outputs
354360
strategy:
355361
matrix:
356-
os: [ubuntu-latest, windows-latest, macos-latest]
362+
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
357363
cache: [true, false]
364+
include:
365+
- arch: X64
366+
- os: macos-latest
367+
arch: ARM64
358368
runs-on: ${{ matrix.os }}
359369
steps:
370+
# Specifying a specific architecture of the runner is not possible for Github hosted runners
371+
# We can only check if the runner architecture matches the expected one
372+
- name: check_runner_arch
373+
shell: bash
374+
run: |
375+
echo "Runner architecture: ${{ runner.arch }}"
376+
if [[ "${{ runner.arch }}" != "${{ matrix.arch }}" ]]; then
377+
echo "##[error]Runner architecture does not match the expected one"
378+
exit 1
379+
fi
380+
360381
- uses: actions/checkout@v3
361382
with:
362383
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

‎action.yml‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@ runs:
3030
shell: bash
3131
run: brew install coreutils
3232

33-
# installing jre is required because the non self-contained sonar-scanner-cli is used on Linux ARM64
34-
- name: Install JRE for linux arm64
35-
uses: actions/setup-java@v4
36-
if: runner.os == 'Linux' && runner.arch == 'ARM64'
37-
with:
38-
distribution: 'temurin'
39-
java-version: '17'
40-
4133
- name: Verify and create installation path
4234
shell: bash
4335
env:
@@ -58,14 +50,16 @@ runs:
5850
INSTALL_PATH: ${{ inputs.installation-path }}
5951
SONAR_HOST_URL: 'https://sonarcloud.io'
6052
SONAR_SCANNER_VERSION: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-version }}
61-
SONAR_SCANNER_URL_WINDOWS: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-url-windows }}
62-
SONAR_SCANNER_SHA_WINDOWS: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-sha-windows }}
63-
SONAR_SCANNER_URL_LINUX: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-url-linux }}
64-
SONAR_SCANNER_SHA_LINUX: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-sha-linux }}
65-
SONAR_SCANNER_URL_MACOSX: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-url-macosx }}
66-
SONAR_SCANNER_SHA_MACOSX: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-sha-macosx }}
67-
SONAR_SCANNER_URL_UNIVERSAL: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-url-universal }}
68-
SONAR_SCANNER_SHA_UNIVERSAL: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-sha-universal }}
53+
SONAR_SCANNER_URL_WINDOWS_X64: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-url-windows-x64 }}
54+
SONAR_SCANNER_SHA_WINDOWS_X64: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-sha-windows-x64 }}
55+
SONAR_SCANNER_URL_LINUX_X64: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-url-linux-x64 }}
56+
SONAR_SCANNER_SHA_LINUX_X64: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-sha-linux-x64 }}
57+
SONAR_SCANNER_URL_LINUX_AARCH64: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-url-linux-aarch64 }}
58+
SONAR_SCANNER_SHA_LINUX_AARCH64: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-sha-linux-aarch64 }}
59+
SONAR_SCANNER_URL_MACOSX_X64: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-url-macosx-x64 }}
60+
SONAR_SCANNER_SHA_MACOSX_X64: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-sha-macosx-x64 }}
61+
SONAR_SCANNER_URL_MACOSX_AARCH64: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-url-macosx-aarch64 }}
62+
SONAR_SCANNER_SHA_MACOSX_AARCH64: ${{ steps.sonar-scanner-version.outputs.sonar-scanner-sha-macosx-aarch64 }}
6963
run: ${GITHUB_ACTION_PATH}/scripts/configure_paths.sh >> $GITHUB_OUTPUT
7064

7165
- name: Cache sonar-scanner installation
@@ -76,7 +70,7 @@ runs:
7670
# The default value is 60mins. Reaching timeout is treated the same as a cache miss.
7771
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
7872
with:
79-
key: sonar-scanner-${{ runner.os }}-${{ steps.sonar-scanner-version.outputs.sonar-scanner-version }}
73+
key: sonar-scanner-${{ runner.os }}-${{ runner.arch }}-${{ steps.sonar-scanner-version.outputs.sonar-scanner-version }}
8074
path: ${{ steps.configure_paths.outputs.sonar-scanner-dir }}
8175

8276
- name: Download and install sonar-scanner

‎scripts/configure_paths.sh‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,48 @@ fi
77

88
case ${OS} in
99
Windows)
10-
SONAR_SCANNER_SUFFIX="-windows"
10+
SONAR_SCANNER_SUFFIX="windows-x64"
1111
BUILD_WRAPPER_SUFFIX="win-x86"
1212
SONAR_SCANNER_NAME="sonar-scanner.bat"
1313
BUILD_WRAPPER_NAME="build-wrapper-win-x86-64.exe"
14-
SONAR_SCANNER_URL="${SONAR_SCANNER_URL_WINDOWS}"
15-
SONAR_SCANNER_SHA="${SONAR_SCANNER_SHA_WINDOWS}"
14+
SONAR_SCANNER_URL="${SONAR_SCANNER_URL_WINDOWS_X64}"
15+
SONAR_SCANNER_SHA="${SONAR_SCANNER_SHA_WINDOWS_X64}"
1616
;;
1717
Linux)
1818
case ${ARCH} in
1919
X64)
20-
SONAR_SCANNER_SUFFIX="-linux"
20+
SONAR_SCANNER_SUFFIX="linux-x64"
2121
BUILD_WRAPPER_SUFFIX="linux-x86"
2222
BUILD_WRAPPER_NAME="build-wrapper-linux-x86-64"
23-
SONAR_SCANNER_URL="${SONAR_SCANNER_URL_LINUX}"
24-
SONAR_SCANNER_SHA="${SONAR_SCANNER_SHA_LINUX}"
23+
SONAR_SCANNER_URL="${SONAR_SCANNER_URL_LINUX_X64}"
24+
SONAR_SCANNER_SHA="${SONAR_SCANNER_SHA_LINUX_X64}"
2525
;;
2626
ARM64)
27-
SONAR_SCANNER_SUFFIX=""
27+
SONAR_SCANNER_SUFFIX="linux-aarch64"
2828
BUILD_WRAPPER_SUFFIX="linux-aarch64"
2929
BUILD_WRAPPER_NAME="build-wrapper-linux-aarch64"
30-
SONAR_SCANNER_URL="${SONAR_SCANNER_URL_UNIVERSAL}"
31-
SONAR_SCANNER_SHA="${SONAR_SCANNER_SHA_UNIVERSAL}"
30+
SONAR_SCANNER_URL="${SONAR_SCANNER_URL_LINUX_AARCH64}"
31+
SONAR_SCANNER_SHA="${SONAR_SCANNER_SHA_LINUX_AARCH64}"
3232
;;
3333
esac
3434
SONAR_SCANNER_NAME="sonar-scanner"
3535
;;
3636
macOS)
37-
SONAR_SCANNER_SUFFIX="-macosx"
37+
case ${ARCH} in
38+
X64)
39+
SONAR_SCANNER_SUFFIX="macosx-x64"
40+
SONAR_SCANNER_URL="${SONAR_SCANNER_URL_MACOSX_X64}"
41+
SONAR_SCANNER_SHA="${SONAR_SCANNER_SHA_MACOSX_X64}"
42+
;;
43+
ARM64)
44+
SONAR_SCANNER_SUFFIX="macosx-aarch64"
45+
SONAR_SCANNER_URL="${SONAR_SCANNER_URL_MACOSX_AARCH64}"
46+
SONAR_SCANNER_SHA="${SONAR_SCANNER_SHA_MACOSX_AARCH64}"
47+
;;
48+
esac
3849
BUILD_WRAPPER_SUFFIX="macosx-x86"
3950
SONAR_SCANNER_NAME="sonar-scanner"
4051
BUILD_WRAPPER_NAME="build-wrapper-macosx-x86"
41-
SONAR_SCANNER_URL="${SONAR_SCANNER_URL_MACOSX}"
42-
SONAR_SCANNER_SHA="${SONAR_SCANNER_SHA_MACOSX}"
4352
;;
4453
*)
4554
echo "::error::Unsupported runner OS '${OS}'"
@@ -51,7 +60,7 @@ esac
5160
echo "sonar-scanner-url=${SONAR_SCANNER_URL}"
5261
echo "sonar-scanner-sha=${SONAR_SCANNER_SHA}"
5362

54-
SONAR_SCANNER_DIR="${INSTALL_PATH}/sonar-scanner-${SONAR_SCANNER_VERSION}${SONAR_SCANNER_SUFFIX}"
63+
SONAR_SCANNER_DIR="${INSTALL_PATH}/sonar-scanner-${SONAR_SCANNER_VERSION}-${SONAR_SCANNER_SUFFIX}"
5564
echo "sonar-scanner-dir=${SONAR_SCANNER_DIR}"
5665
echo "sonar-scanner-bin=${SONAR_SCANNER_DIR}/bin/${SONAR_SCANNER_NAME}"
5766

‎scripts/fetch_latest_version.sh‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@ check_status "Failed to fetch latest sonar-scanner version from GitHub API"
88

99
echo "sonar-scanner-version=${SONAR_SCANNER_VERSION}"
1010

11-
for OS in windows linux macosx universal; do
12-
if [[ ${OS} == "universal" ]]; then
13-
SONAR_SCANNER_URL="https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip"
11+
for OS in windows linux macosx; do
12+
if [[ "$OS" == "windows" ]]; then
13+
ARCHS=("x64")
1414
else
15-
SONAR_SCANNER_URL="https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-${OS}.zip"
15+
ARCHS=("x64" "aarch64")
1616
fi
17-
SONAR_SCANNER_SHA=$(curl -sSL "${SONAR_SCANNER_URL}.sha256")
18-
check_status "Failed to download ${OS} sonar-scanner checksum from '${SONAR_SCANNER_URL}'"
17+
for ARCH in "${ARCHS[@]}"; do
18+
SONAR_SCANNER_URL="https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-${OS}-${ARCH}.zip"
19+
SONAR_SCANNER_SHA=$(curl -sSL "${SONAR_SCANNER_URL}.sha256")
20+
check_status "Failed to download ${OS} ${ARCH} sonar-scanner checksum from '${SONAR_SCANNER_URL}'"
1921

20-
echo "sonar-scanner-url-${OS}=${SONAR_SCANNER_URL}"
21-
echo "sonar-scanner-sha-${OS}=${SONAR_SCANNER_SHA}"
22+
echo "sonar-scanner-url-${OS}-${ARCH}=${SONAR_SCANNER_URL}"
23+
echo "sonar-scanner-sha-${OS}-${ARCH}=${SONAR_SCANNER_SHA}"
24+
done
2225
done

‎sonar-scanner-version‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
sonar-scanner-version=6.0.0.4432
2-
sonar-scanner-url-windows=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.0.0.4432-windows.zip
3-
sonar-scanner-sha-windows=4773dbafd2ce335c0ccaefd3606742bf59658987b5e3c6aa99e51d7ef57a8f33
4-
sonar-scanner-url-linux=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.0.0.4432-linux.zip
5-
sonar-scanner-sha-linux=f4c08ec679eeae34a7a1a5df87ee546c287f4683d1dd86afa0aae50e808e0002
6-
sonar-scanner-url-macosx=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.0.0.4432-macosx.zip
7-
sonar-scanner-sha-macosx=1a492fe70cbb5587ee90344c03a3d18f259dfc9d00a9e1bef946277e89148987
8-
sonar-scanner-url-universal=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.0.0.4432.zip
9-
sonar-scanner-sha-universal=965a18c438a213aa2167b51c793116987bc2a9df9ad245c8e02d3ab3e54022e7
1+
sonar-scanner-version=6.1.0.4477
2+
sonar-scanner-url-windows-x64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.1.0.4477-windows-x64.zip
3+
sonar-scanner-sha-windows-x64=1c518fdefd1e6507475f92a0afec3720ceac9a79756773a14b461737dea0ab0f
4+
sonar-scanner-url-linux-x64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.1.0.4477-linux-x64.zip
5+
sonar-scanner-sha-linux-x64=aa985eacaa4155a064647370b62fc82d1b0e06caf1d493e04c2389dd5ac74fcb
6+
sonar-scanner-url-linux-aarch64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.1.0.4477-linux-aarch64.zip
7+
sonar-scanner-sha-linux-aarch64=a8d4af9776988e096e0d6bddad02d879e6c8c2cdc0c4c1c05e04208cca8d5a05
8+
sonar-scanner-url-macosx-x64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.1.0.4477-macosx-x64.zip
9+
sonar-scanner-sha-macosx-x64=7bb3516c8176ec7be43982e0cb78c1ce462741ad9ce092037e12b2fc8411eb85
10+
sonar-scanner-url-macosx-aarch64=https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.1.0.4477-macosx-aarch64.zip
11+
sonar-scanner-sha-macosx-aarch64=7c7e69b6cf54e3a5ff67a08199d557e896f51bcc9b2f8f5f238a5aa359653659

0 commit comments

Comments
 (0)