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

Jump to bottom

Add fix for running jazzy on M1/ARM #659

Merged
merged 3 commits into from
Jan 6, 2023
Merged

Add fix for running jazzy on M1/ARM #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8045cd4
Add fix for running jazzy on M1/ARM
louwers Jan 5, 2023
656915f
Source ~/.bashrc in document.sh
louwers Jan 6, 2023
5c6c1c8
Assume jazzy and ffi are installed
louwers Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions platform/ios/platform/ios/scripts/document.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

set -euo pipefail

source ~/.bashrc

function step { >&2 echo -e "\033[1m\033[36m* $@\033[0m"; }
function finish { >&2 echo -en "\033[0m"; }
trap finish EXIT
Expand Down
21 changes: 0 additions & 21 deletions platform/ios/platform/ios/scripts/install-packaging-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,4 @@ else
echo "Found awscli"
fi


##
## jazzy
##
if [[ -z `which jazzy` || $(jazzy -v) != "jazzy version: ${JAZZY_VERSION}" ]]; then
step "Installing jazzy…"

if [[ "${CILAUNCH}" == true ]]; then
sudo gem install jazzy -v $JAZZY_VERSION --no-document
else
gem install jazzy -v $JAZZY_VERSION --no-document
fi

if [ -z `which jazzy` ]; then
echo "Unable to install jazzy ($JAZZY_VERSION). See https://github.com/mapbox/mapbox-gl-native-ios/blob/master/platform/ios/INSTALL.md"
exit 1
fi
else
echo "Found jazzy (${JAZZY_VERSION})"
fi

step "Finished installing packaging dependencies"