From d92431b404b80b2e111c00a94eae51bbb45920fa Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Fri, 6 Jan 2023 11:40:38 +0100 Subject: [PATCH] Add fix for running jazzy on M1/ARM (#659) --- platform/ios/platform/ios/scripts/document.sh | 2 ++ .../scripts/install-packaging-dependencies.sh | 21 ------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/platform/ios/platform/ios/scripts/document.sh b/platform/ios/platform/ios/scripts/document.sh index c44b5bf5b..d6e20dbbb 100755 --- a/platform/ios/platform/ios/scripts/document.sh +++ b/platform/ios/platform/ios/scripts/document.sh @@ -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 diff --git a/platform/ios/platform/ios/scripts/install-packaging-dependencies.sh b/platform/ios/platform/ios/scripts/install-packaging-dependencies.sh index ec2b8b1e3..86ed871bd 100755 --- a/platform/ios/platform/ios/scripts/install-packaging-dependencies.sh +++ b/platform/ios/platform/ios/scripts/install-packaging-dependencies.sh @@ -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"