Skip to content

Commit f39f726

Browse files
CLI-122 Add support for Mac x64
1 parent e04c9c8 commit f39f726

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ jobs:
104104
bun build src/index.ts --compile --outfile dist/sonarqube-cli-${PROJECT_VERSION}-windows-x86-64.exe --target bun-windows-x64
105105
bun build src/index.ts --compile --outfile dist/sonarqube-cli-${PROJECT_VERSION}-linux-x86-64.exe --target bun-linux-x64
106106
bun build src/index.ts --compile --outfile dist/sonarqube-cli-${PROJECT_VERSION}-macos-arm64.exe --target bun-darwin-arm64
107+
bun build src/index.ts --compile --outfile dist/sonarqube-cli-${PROJECT_VERSION}-macos-x64.exe --target bun-darwin-x64
107108
108109
- name: Sign binaries
109110
env:
@@ -113,6 +114,7 @@ jobs:
113114
run: |
114115
bun build-scripts/sign.mjs dist/sonarqube-cli-${PROJECT_VERSION}-linux-x86-64.exe
115116
bun build-scripts/sign.mjs dist/sonarqube-cli-${PROJECT_VERSION}-macos-arm64.exe
117+
bun build-scripts/sign.mjs dist/sonarqube-cli-${PROJECT_VERSION}-macos-x64.exe
116118
bun build-scripts/sign.mjs dist/sonarqube-cli-${PROJECT_VERSION}-windows-x86-64.exe
117119
118120
- name: Copy user scripts to dist
@@ -131,7 +133,7 @@ jobs:
131133
ARTIFACTORY_DEPLOY_REPO: sonarsource-public-qa
132134
PROJECT: ${{ github.event.repository.name }}
133135
BUILD_NUMBER: ${{ needs.prepare.outputs.BUILD_NUMBER }}
134-
ARTIFACTS_TO_PUBLISH: "org.sonarsource.cli:sonarqube-cli:exe:linux-x86-64,org.sonarsource.cli:sonarqube-cli:exe:macos-arm64,org.sonarsource.cli:sonarqube-cli:exe:windows-x86-64"
136+
ARTIFACTS_TO_PUBLISH: "org.sonarsource.cli:sonarqube-cli:exe:linux-x86-64,org.sonarsource.cli:sonarqube-cli:exe:macos-arm64,org.sonarsource.cli:sonarqube-cli:exe:macos-x64,org.sonarsource.cli:sonarqube-cli:exe:windows-x86-64"
135137
run: |
136138
jf config add repox \
137139
--artifactory-url="${ARTIFACTORY_URL}" \

user-scripts/install.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,19 @@ trap cleanup EXIT
1313
BASE_URL="https://binaries.sonarsource.com/Distribution/sonarqube-cli"
1414

1515
detect_platform() {
16-
local os
16+
local os arch
1717
os="$(uname -s)"
1818
case "$os" in
1919
Linux*)
2020
echo "linux-x86-64"
2121
;;
2222
Darwin*)
23-
echo "macos-arm64"
23+
arch="$(uname -m)"
24+
if [[ "$arch" == "arm64" ]]; then
25+
echo "macos-arm64"
26+
else
27+
echo "macos-x64"
28+
fi
2429
;;
2530
*)
2631
echo "Unsupported operating system: $os" >&2

0 commit comments

Comments
 (0)