diff options
| author | Nadia Barbosa <nadiabarbosa@me.com> | 2019-04-08 16:41:10 -0700 |
|---|---|---|
| committer | Nadia Barbosa <nadiabarbosa@me.com> | 2019-04-23 15:11:01 -0700 |
| commit | abe688e49df881a858f277887dd92a1dc3d9dcd6 (patch) | |
| tree | 3b632fa4535d07d99f049b479dd1b3864016b89f | |
| parent | f05a826a764c496ef71bfa909708627d1a5f328f (diff) | |
| download | qtlocation-mapboxgl-abe688e49df881a858f277887dd92a1dc3d9dcd6.tar.gz | |
Fix CI issue by checking for existing token set in environment variable
| -rw-r--r-- | platform/ios/app/Info.plist | 2 | ||||
| -rw-r--r-- | platform/ios/ios.xcodeproj/project.pbxproj | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/platform/ios/app/Info.plist b/platform/ios/app/Info.plist index 39a5487bd9..e2f294a5a5 100644 --- a/platform/ios/app/Info.plist +++ b/platform/ios/app/Info.plist @@ -2,8 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>MGLMapboxAccessToken</key> - <string>INSERT_ACCESS_TOKEN</string> <key>CFBundleDevelopmentRegion</key> <string>en</string> <key>CFBundleDisplayName</key> diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index ecf9739cd3..a015050c7d 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -2761,6 +2761,7 @@ }; DA1DC9491CB6C1C2006E619F = { CreatedOnToolsVersion = 7.3; + DevelopmentTeam = GJZR2MEM28; LastSwiftMigration = 0820; }; DA2E88501CC036F400F24E7B = { @@ -2787,6 +2788,7 @@ developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, "zh-Hans", @@ -2934,7 +2936,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "token_file=$SRCROOT/mapbox_access_token\n\n# First check the above path, then the user directory.\n# Ignore exit codes from `cat`.\ntoken=\"$(cat $token_file 2> /dev/null)\" || token=\"$(cat ~/.mapbox 2> /dev/null)\"\n\nif [ \"$token\" ]; then\nplutil -replace MGLMapboxAccessToken -string $token \"$TARGET_BUILD_DIR/$INFOPLIST_PATH\"\necho \"Token successfully inserted\"\nelse\necho 'error: Missing Mapbox access token'\necho \"error: Get an access token from <https://www.mapbox.com/studio/account/tokens/>, then create a new file at $token_file that contains the access token.\"\nexit 1\nfi\n\n"; + shellScript = "if [[ -z \"$MAPBOX_ACCESS_TOKEN\" ]]; then\n\ntoken_file=$SRCROOT/mapbox_access_token\n\n# First check the above path, then the user directory.\n# Ignore exit codes from `cat`.\ntoken=\"$(cat $token_file 2> /dev/null)\" || token=\"$(cat ~/.mapbox 2> /dev/null)\"\nelse\n# We have a token in the environment\ntoken=$MAPBOX_ACCESS_TOKEN\nfi\n\nif [ \"$token\" ]; then\nplutil -replace MGLMapboxAccessToken -string $token \"$TARGET_BUILD_DIR/$INFOPLIST_PATH\"\nelse\necho 'error: Missing Mapbox access token'\necho \"error: Get an access token from <https://www.mapbox.com/studio/account/tokens/>, then create a new file at $token_file that contains the access token.\"\nexit 1\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -3673,7 +3675,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = GJZR2MEM28; INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; @@ -4010,7 +4012,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = GJZR2MEM28; INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; @@ -4022,7 +4024,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = GJZR2MEM28; INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; |