bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix install.sh refusing to download macos-arm64 standalone. (#6968) 

* Fix install.sh refusing to download macos-arm64 standalone.

* Update tests for macos-arm64 and amd64.
This commit is contained in:
Yuchen Shi 2024-09-03 11:25:06 -07:00 committed by GitHub
parent 90f8135c68
commit 9286e0002d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install.sh
View File

@ -461,9 +461,9 @@ npm_fallback() {
# Determine if we have standalone releases on GitHub for the system's arch. # Determine if we have standalone releases on GitHub for the system's arch.
has_standalone() { has_standalone() {
case $ARCH in case $ARCH in
amd64) return 0 ;; arm64) return 0 ;;
# We only have amd64 for macOS. # We only have arm64 for macOS.
arm64) amd64)
[ "$(distro)" != macos ] [ "$(distro)" != macos ]
return return
;; ;;

10
test/scripts/install.bats
View File

@ -132,15 +132,15 @@ function should-use-standalone() {
# macOS use homebrew but falls back to standalone when brew is unavailable then # macOS use homebrew but falls back to standalone when brew is unavailable then
# to npm for unsupported architectures. # to npm for unsupported architectures.
@test "$SCRIPT_NAME: macos arm64 (no brew)" {
should-fallback-npm-brew "arm64"
}
@test "$SCRIPT_NAME: macos amd64 (no brew)" { @test "$SCRIPT_NAME: macos amd64 (no brew)" {
BREW_PATH= OS=macos ARCH=amd64 run "$SCRIPT" --dry-run should-fallback-npm-brew "amd64"
}
@test "$SCRIPT_NAME: macos arm64 (no brew)" {
BREW_PATH= OS=macos ARCH=arm64 run "$SCRIPT" --dry-run
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[ "${lines[1]}" = "Homebrew not installed." ] [ "${lines[1]}" = "Homebrew not installed." ]
[ "${lines[2]}" = "Falling back to standalone installation." ] [ "${lines[2]}" = "Falling back to standalone installation." ]
[ "${lines[3]}" = "Installing v$VERSION of the amd64 release from GitHub." ] [ "${lines[3]}" = "Installing v$VERSION of the arm64 release from GitHub." ]
[[ "${lines[-6]}" = "Standalone release has been installed"* ]] [[ "${lines[-6]}" = "Standalone release has been installed"* ]]
} }
@test "$SCRIPT_NAME: macos i386 (no brew)" { @test "$SCRIPT_NAME: macos i386 (no brew)" {