From 7c2c2ca013c5746d65985d8f2915a24d0292ae16 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Wed, 14 Jun 2017 16:27:45 -0700 Subject: [PATCH] Fix issues in CI --- fastlane/Fastfile | 8 ++++++++ pass.xcodeproj/project.pbxproj | 25 ++++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 3d5138d..f8f0654 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -48,6 +48,14 @@ platform :ios do ) match( type: "appstore", + app_identifier: "me.mssun.passforios", + keychain_name: ENV["MATCH_KEYCHAIN_NAME"], + keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"], + readonly: true + ) + match( + type: "appstore", + app_identifier: "me.mssun.passforios.extension", keychain_name: ENV["MATCH_KEYCHAIN_NAME"], keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"], readonly: true diff --git a/pass.xcodeproj/project.pbxproj b/pass.xcodeproj/project.pbxproj index b61f9b8..9400df0 100644 --- a/pass.xcodeproj/project.pbxproj +++ b/pass.xcodeproj/project.pbxproj @@ -664,9 +664,8 @@ TargetAttributes = { A26075771EEC6F34005DB03E = { CreatedOnToolsVersion = 8.3.3; - DevelopmentTeam = 4WDM8E95VU; LastSwiftMigration = 0830; - ProvisioningStyle = Automatic; + ProvisioningStyle = Manual; }; A260757F1EEC6F34005DB03E = { CreatedOnToolsVersion = 8.3.3; @@ -793,7 +792,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; 3D4E80016BEE92B70CE75405 /* [CP] Check Pods Manifest.lock */ = { @@ -808,7 +807,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; 3DF553C0C5F39FA193B9C51E /* [CP] Embed Pods Frameworks */ = { @@ -853,7 +852,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; 7FCFE5D7F8EC0AA1014367B8 /* [CP] Copy Pods Resources */ = { @@ -1066,7 +1065,7 @@ CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 4WDM8E95VU; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -1088,6 +1087,7 @@ OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios.passKit; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; SWIFT_OBJC_BRIDGING_HEADER = ""; @@ -1110,7 +1110,7 @@ CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 4WDM8E95VU; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -1132,6 +1132,7 @@ OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios.passKit; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; SWIFT_OBJC_BRIDGING_HEADER = ""; @@ -1180,6 +1181,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = passextension/passextension.entitlements; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = 4WDM8E95VU; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1194,8 +1196,10 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_CFLAGS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios.passextension; + PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios.extension; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = "9feb619f-73bb-429c-a2a8-856ddcbb9e33"; + PROVISIONING_PROFILE_SPECIFIER = "match Development me.mssun.passforios.extension"; SKIP_INSTALL = YES; SWIFT_VERSION = 3.0; }; @@ -1209,6 +1213,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = passextension/passextension.entitlements; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; DEVELOPMENT_TEAM = 4WDM8E95VU; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1223,8 +1228,10 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_CFLAGS = "$(inherited)"; - PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios.passextension; + PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios.extension; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = "9b4419c3-a959-4af8-8810-8af134008ec5"; + PROVISIONING_PROFILE_SPECIFIER = "match AppStore me.mssun.passforios.extension"; SKIP_INSTALL = YES; SWIFT_VERSION = 3.0; };