diff options
| author | Justin R. Miller <incanus@codesorcery.net> | 2015-06-19 15:56:53 -0700 |
|---|---|---|
| committer | Justin R. Miller <incanus@codesorcery.net> | 2015-06-19 15:56:53 -0700 |
| commit | 0955dfc19f30aedcc95e7e3c03c73d3dcc149c44 (patch) | |
| tree | db0bc4095d2381d1a1bf3ae5a07bd8c30d455714 /scripts | |
| parent | 898f4d3f084fc9553b92956da04019af90a4f872 (diff) | |
| parent | cfa0890d821b1d60b32f957931ffde2abc25c664 (diff) | |
| download | qtlocation-mapboxgl-0955dfc19f30aedcc95e7e3c03c73d3dcc149c44.tar.gz | |
Merge branch 'release-v0.4.0'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ios/package.sh | 2 | ||||
| -rwxr-xr-x | scripts/ios/run.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh index 5d7cbdc32d..25306bb066 100755 --- a/scripts/ios/package.sh +++ b/scripts/ios/package.sh @@ -109,7 +109,7 @@ if [ -z `which appledoc` ]; then exit 1 fi DOCS_OUTPUT="${OUTPUT}/static/Docs" -DOCS_VERSION=$( git tag -l ios\* --sort -v:refname | sed -n '1p' | sed 's/^v//' ) +DOCS_VERSION=$( git tag --sort -v:refname | grep -v '\-rc.' | sed -n '1p' | sed 's/^v//' ) rm -rf /tmp/mbgl mkdir -p /tmp/mbgl/ README=/tmp/mbgl/GL-README.md diff --git a/scripts/ios/run.sh b/scripts/ios/run.sh index 6d002d4853..c23b485e26 100755 --- a/scripts/ios/run.sh +++ b/scripts/ios/run.sh @@ -8,7 +8,7 @@ source ./scripts/ios/setup.sh BUILDTYPE=${BUILDTYPE:-Release} -PUBLISH_TAG=($(git show -s --format=%B | sed -n 's/.*\[publish \([a-z]\{1,\}\)-v\([0-9.]\{1,\}\)\].*/\1 \2/p')) +PUBLISH_TAG=($(git show -s --format=%B | sed -n 's/.*\[publish \([a-z]\{1,\}\)-v\([0-9a-z.\-]\{1,\}\)\].*/\1 \2/p')) PUBLISH_PLATFORM=${PUBLISH_TAG[0],-} PUBLISH_VERSION=${PUBLISH_TAG[1],-} |