From 48e51e788c09535057b9b4a6ac98ae750c04fa37 Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Fri, 14 Jan 2022 12:14:50 -0800 Subject: [PATCH 1/4] Use manual signing for provisioning profile --- ios/NewExpensify.xcodeproj/project.pbxproj | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index 4601b84bda98..1008cb0832e0 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -287,7 +287,7 @@ 13B07F861A680F5B00A75B9A = { DevelopmentTeam = 368M544MTT; LastSwiftMigration = 1230; - ProvisioningStyle = Automatic; + ProvisioningStyle = Manual; }; }; }; @@ -849,10 +849,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = NewExpensify/Chat.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 3; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 368M544MTT; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; INFOPLIST_FILE = "$(SRCROOT)/NewExpensify/Info.plist"; @@ -866,7 +866,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.chat.expensify.chat; PRODUCT_NAME = "New Expensify"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = chat_expensify_appstore; SWIFT_OBJC_BRIDGING_HEADER = "ExpensifyCash-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -882,10 +882,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = NewExpensify/Chat.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 3; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 368M544MTT; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; INFOPLIST_FILE = NewExpensify/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; @@ -898,7 +898,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.chat.expensify.chat; PRODUCT_NAME = "New Expensify"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = chat_expensify_appstore; SWIFT_OBJC_BRIDGING_HEADER = "ExpensifyCash-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; From 6a8df916b2f19fc61ca74caba58a2e6798216b04 Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Fri, 14 Jan 2022 12:55:19 -0800 Subject: [PATCH 2/4] add check for automatic profile --- .github/workflows/test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2d3a8824e342..b387a736937b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,13 @@ jobs: if: github.actor != 'OSBotify' runs-on: ubuntu-latest steps: + - name: Check Provisioning Style + run: | + if grep -q 'ProvisioningStyle = Automatic;' ios/NewExpensify.xcodeproj/project.pbxproj; then + echo "Error: Automatic provisioning style is not allowed!" + exit 1 + fi + - uses: actions/checkout@v2 - name: Use Node.js From 3f82dfc42a71b0d0d6ae49a638d8fe8841039bc0 Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Fri, 14 Jan 2022 13:01:23 -0800 Subject: [PATCH 3/4] move test after checkout --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b387a736937b..fd5196415938 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,8 @@ jobs: if: github.actor != 'OSBotify' runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 + - name: Check Provisioning Style run: | if grep -q 'ProvisioningStyle = Automatic;' ios/NewExpensify.xcodeproj/project.pbxproj; then @@ -17,8 +19,6 @@ jobs: exit 1 fi - - uses: actions/checkout@v2 - - name: Use Node.js uses: actions/setup-node@v1 with: From 9b11ed7d88fde19737593414c779af8e80df1506 Mon Sep 17 00:00:00 2001 From: Joe Gambino Date: Fri, 14 Jan 2022 13:12:36 -0800 Subject: [PATCH 4/4] add proper check --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fd5196415938..5aa6504102ef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,9 +12,12 @@ jobs: steps: - uses: actions/checkout@v2 + # If automatic signing is enabled, iOS builds will fail, so ensure we always have the proper profile specified - name: Check Provisioning Style run: | - if grep -q 'ProvisioningStyle = Automatic;' ios/NewExpensify.xcodeproj/project.pbxproj; then + if grep -q 'PROVISIONING_PROFILE_SPECIFIER = chat_expensify_appstore' ios/NewExpensify.xcodeproj/project.pbxproj; then + exit 0 + else echo "Error: Automatic provisioning style is not allowed!" exit 1 fi