Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Install script supports Apple ARM with Rosetta #18016

Merged
merged 2 commits into from
Jul 18, 2023
Merged

chore: Install script supports Apple ARM with Rosetta #18016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b625edd
chore: Install script supports Apple ARM with Rosetta
spencergilbert Jul 18, 2023
216eeb8
+spellings
spencergilbert Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions .github/actions/spelling/expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
abcd
abcdefghijklm
abcdefghijklmnopqrstuvwxyzand
abced
abortable
acb
ack'ing
acking
Acq
Expand Down Expand Up @@ -37,7 +35,6 @@ ARNOTAREALIDD
arshiyasolei
asdf
asdfasdf
ASMS
assertverify
Asterix
asynk
Expand Down Expand Up @@ -140,7 +137,6 @@ casttype
castvalue
cbe
CBOR
cbs
cddl
cdeab
cdylib
Expand Down Expand Up @@ -304,7 +300,6 @@ ebfcee
edenhill
edns
eeyun
efg
efgh
Elhage
emca
Expand All @@ -325,7 +320,6 @@ ENVARS
envsubst
EOIG
EOL'ed
Erfxl
Err'ing
errorf
Errorsfor
Expand Down Expand Up @@ -469,7 +463,6 @@ hannes
Hashbang
hashbrown
hashindex
hashlink
hashring
hashset
hashsum
Expand Down Expand Up @@ -778,6 +771,7 @@ NQTP
nresamples
nullishness
numbackends
oahd
oap
OKD
omfwd
Expand Down Expand Up @@ -821,6 +815,7 @@ pathgen
peekable
PEMS
pgmajfault
pgrep
PII
Pitbull
pkc
Expand Down Expand Up @@ -1053,7 +1048,6 @@ supertrait
suser
sustainability
svalue
Sya
sysfs
sysinit
syslogng
Expand Down Expand Up @@ -1114,7 +1108,6 @@ Tomola
tonydanza
toolbars
toolchains
TOOLSDIRECTORY
toolset
toor
topdir
Expand Down
10 changes: 10 additions & 0 deletions distribution/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,16 @@ install_from_archive() {
x86_64-*linux*-musl)
_archive_arch="x86_64-unknown-linux-musl"
;;
aarch64-apple-darwin)
# This if statement can be removed when Vector publishes aarch64-apple-darwin builds
if /usr/bin/pgrep oahd >/dev/null 2>&1; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For other readers, pgrep seems to preinstalled on OSX.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And oahd is a process for Rosetta 👍

echo "Rosetta is installed, installing x86_64-apple-darwin archive"
_archive_arch="x86_64-apple-darwin"
else
echo "Builds for Apple Silicon are not published today, please install Rosetta"
err "unsupported arch: $_arch"
fi
;;
aarch64-*linux*)
_archive_arch="aarch64-unknown-linux-musl"
;;
Expand Down