diff options
| author | Jason Wray <jason@mapbox.com> | 2018-05-30 12:56:55 -0400 |
|---|---|---|
| committer | Jason Wray <jason@mapbox.com> | 2018-05-30 13:01:04 -0400 |
| commit | e67f0be81301abce9454c678f677d37d61a03631 (patch) | |
| tree | 223a5523b4142ca3136589fd492c2f4e19ea82aa /platform/ios/scripts/add-key.sh | |
| parent | 83ebd5f6ff56fddd4a2923f6c082977476cddd99 (diff) | |
| parent | 43efd61813dfddb0ac673314350d95aa1a86b8cb (diff) | |
| download | qtlocation-mapboxgl-e67f0be81301abce9454c678f677d37d61a03631.tar.gz | |
Merge tag 'ios-v4.0.2' into masterupstream/fb-merge-release-ios-v4.0.2
Conflicts:
mapbox-gl-js
platform/android/CHANGELOG.md
platform/android/gradle/dependencies.gradle
platform/ios/CHANGELOG.md
platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
platform/ios/Mapbox-iOS-SDK-symbols.podspec
platform/ios/Mapbox-iOS-SDK.podspec
platform/node/test/ignores.json
src/mbgl/geometry/feature_index.cpp
src/mbgl/geometry/feature_index.hpp
src/mbgl/layout/symbol_layout.cpp
Diffstat (limited to 'platform/ios/scripts/add-key.sh')
| -rwxr-xr-x | platform/ios/scripts/add-key.sh | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/platform/ios/scripts/add-key.sh b/platform/ios/scripts/add-key.sh deleted file mode 100755 index 37a989025e..0000000000 --- a/platform/ios/scripts/add-key.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# This is all taken from http://www.objc.io/issue-6/travis-ci.html - -# Create a custom keychain -security create-keychain -p travis ios-build.keychain - -# Make the custom keychain default, so xcodebuild will use it for signing -security default-keychain -s ios-build.keychain - -# Unlock the keychain -security unlock-keychain -p travis ios-build.keychain - -# Set keychain timeout to 1 hour for long builds -# see http://www.egeek.me/2013/02/23/jenkins-and-xcode-user-interaction-is-not-allowed/ -security set-keychain-settings -t 3600 -l ~/Library/Keychains/ios-build.keychain - -# Add certificates to keychain and allow codesign to access them -security import ./platform/ios/scripts/apple.crt -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign -security import ./platform/ios/scripts/ios-dist.cer -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign -security import ./platform/ios/scripts/ios-dist.p12 -k ~/Library/Keychains/ios-build.keychain -P $IOS_KEY_PASSWORD -T /usr/bin/codesign - -# Put the provisioning profile in place -mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles -cp "./platform/ios/scripts/$IOS_PROFILE_NAME.mobileprovision" ~/Library/MobileDevice/Provisioning\ Profiles/ |