From 9ab4cb888612e1d43fbb8519f455b97c2378e4a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Mon, 9 Nov 2015 10:08:15 -0800 Subject: [PATCH] [iOS] Fetch tags on install, not ipackage This change removes a git command that requires a network connection from the ipackage target. It was used to ensure that CI has a tag to version the appledoc documentation with, so the same command has been added to install.sh, where a network connection is otherwise expected. Fixes #2320. --- scripts/ios/install.sh | 2 ++ scripts/ios/package.sh | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ios/install.sh b/scripts/ios/install.sh index da081254f..b002aeeca 100755 --- a/scripts/ios/install.sh +++ b/scripts/ios/install.sh @@ -3,6 +3,8 @@ set -e set -o pipefail +git fetch --tags + mapbox_time "checkout_mason" \ git submodule update --init .mason diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh index 58ff3e265..8ee7eb790 100755 --- a/scripts/ios/package.sh +++ b/scripts/ios/package.sh @@ -115,7 +115,6 @@ if [ -z `which appledoc` ]; then exit 1 fi DOCS_OUTPUT="${OUTPUT}/static/Docs" -git fetch --tags DOCS_VERSION=$( git tag | grep ^ios | sed 's/^ios-//' | sort -r | grep -v '\-rc.' | grep -v '\-pre.' | sed -n '1p' | sed 's/^v//' ) rm -rf /tmp/mbgl mkdir -p /tmp/mbgl/