From 087ba963a2595def3da3ce5080ff9b3ab7537581 Mon Sep 17 00:00:00 2001 From: Christopher Hogan Date: Thu, 24 Oct 2019 14:33:17 -0700 Subject: [PATCH 1/5] copy over header files that polyester references to fix the 0.60 merge into sdx-platform --- Libraries/Text/RCTText.xcodeproj/project.pbxproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj index 376bd25adfa959..8e8b2765efaa80 100644 --- a/Libraries/Text/RCTText.xcodeproj/project.pbxproj +++ b/Libraries/Text/RCTText.xcodeproj/project.pbxproj @@ -111,6 +111,10 @@ 9F4658BE23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; }; 9F4658BF23563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; }; 9F4658C023563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; }; + 9F46597C23623E14000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; }; + 9F46597D23623E2D000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; }; + 9F4659A623624EBF000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; }; + 9F4659A723624ECA000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; }; 9F5C189A230DD5E600E3E5A7 /* RCTVirtualTextViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B12D200FEBAA008D9D16 /* RCTVirtualTextViewManager.h */; }; 9F5C189C230DD67C00E3E5A7 /* RCTVirtualTextShadowView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B12C200FEBAA008D9D16 /* RCTVirtualTextShadowView.h */; }; 9F5C189D230DD68B00E3E5A7 /* RCTUITextField.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B105200FEBA9008D9D16 /* RCTUITextField.h */; }; @@ -178,6 +182,8 @@ dstPath = include/RCTText; dstSubfolderSpec = 16; files = ( + 9F4659A723624ECA000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */, + 9F4659A623624EBF000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */, 9F5C18B4230DDBEE00E3E5A7 /* RCTBaseTextShadowView.h in Copy Headers */, 9F5C18B5230DDBEE00E3E5A7 /* RCTBaseTextViewManager.h in Copy Headers */, 9F5C18B2230DDBDE00E3E5A7 /* RCTRawTextShadowView.h in Copy Headers */, @@ -211,6 +217,8 @@ dstPath = include/RCTText; dstSubfolderSpec = 16; files = ( + 9F46597D23623E2D000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */, + 9F46597C23623E14000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */, 5970936920845EFC00D163A7 /* RCTTextTransform.h in Copy Headers */, 5956B160200FF324008D9D16 /* RCTBaseTextShadowView.h in Copy Headers */, 5956B161200FF324008D9D16 /* RCTBaseTextViewManager.h in Copy Headers */, From dbdbd5718c21e95221fd339a2fe92e873aabed3a Mon Sep 17 00:00:00 2001 From: Christopher Hogan Date: Thu, 24 Oct 2019 15:02:51 -0700 Subject: [PATCH 2/5] remove unnecessary header inclusions --- Libraries/Text/RCTText.xcodeproj/project.pbxproj | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj index 8e8b2765efaa80..10f46b44458fe8 100644 --- a/Libraries/Text/RCTText.xcodeproj/project.pbxproj +++ b/Libraries/Text/RCTText.xcodeproj/project.pbxproj @@ -107,10 +107,6 @@ 8F2807C7202D2B6B005D65E6 /* RCTInputAccessoryViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C1202D2B6A005D65E6 /* RCTInputAccessoryViewManager.m */; }; 8F2807C8202D2B6B005D65E6 /* RCTInputAccessoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C3202D2B6A005D65E6 /* RCTInputAccessoryView.m */; }; 8F2807C9202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C5202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m */; }; - 9F4658BD23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; }; - 9F4658BE23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; }; - 9F4658BF23563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; }; - 9F4658C023563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; }; 9F46597C23623E14000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; }; 9F46597D23623E2D000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; }; 9F4659A623624EBF000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; }; @@ -505,8 +501,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 9F4658BD23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */, - 9F4658BF23563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */, 9F5C1912230DF3E700E3E5A7 /* RCTTextUIKit.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -515,8 +509,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 9F4658BE23563A92000929DF /* RCTBackedTextInputViewProtocol.h in Headers */, - 9F4658C023563AB8000929DF /* RCTBackedTextInputDelegate.h in Headers */, 9F5C1913230DF3E700E3E5A7 /* RCTTextUIKit.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; From 74c9c37f9796a7225236155ee782831e8a3aed14 Mon Sep 17 00:00:00 2001 From: Christopher Hogan Date: Thu, 24 Oct 2019 15:58:01 -0700 Subject: [PATCH 3/5] copy these files over in a separate copy headers. Having them in the same copy headers causes duplicate symbol problems when building --- .../Text/RCTText.xcodeproj/project.pbxproj | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj index 10f46b44458fe8..f21a6ef4b25f6c 100644 --- a/Libraries/Text/RCTText.xcodeproj/project.pbxproj +++ b/Libraries/Text/RCTText.xcodeproj/project.pbxproj @@ -107,10 +107,10 @@ 8F2807C7202D2B6B005D65E6 /* RCTInputAccessoryViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C1202D2B6A005D65E6 /* RCTInputAccessoryViewManager.m */; }; 8F2807C8202D2B6B005D65E6 /* RCTInputAccessoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C3202D2B6A005D65E6 /* RCTInputAccessoryView.m */; }; 8F2807C9202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F2807C5202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m */; }; - 9F46597C23623E14000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; }; - 9F46597D23623E2D000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; }; - 9F4659A623624EBF000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; }; - 9F4659A723624ECA000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; }; + 9F4659E2236262E9000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; }; + 9F4659E3236262E9000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; }; + 9F4659E42362634A000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B10C200FEBA9008D9D16 /* RCTBackedTextInputDelegate.h */; }; + 9F4659E52362634A000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B112200FEBA9008D9D16 /* RCTBackedTextInputViewProtocol.h */; }; 9F5C189A230DD5E600E3E5A7 /* RCTVirtualTextViewManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B12D200FEBAA008D9D16 /* RCTVirtualTextViewManager.h */; }; 9F5C189C230DD67C00E3E5A7 /* RCTVirtualTextShadowView.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B12C200FEBAA008D9D16 /* RCTVirtualTextShadowView.h */; }; 9F5C189D230DD68B00E3E5A7 /* RCTUITextField.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 5956B105200FEBA9008D9D16 /* RCTUITextField.h */; }; @@ -165,9 +165,11 @@ 183496EA1F5DF07600C0A1B4 /* Copy Headers */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; - dstPath = include/React; + dstPath = include/RCTText; dstSubfolderSpec = 16; files = ( + 9F4659E2236262E9000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */, + 9F4659E3236262E9000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */, ); name = "Copy Headers"; runOnlyForDeploymentPostprocessing = 0; @@ -178,8 +180,6 @@ dstPath = include/RCTText; dstSubfolderSpec = 16; files = ( - 9F4659A723624ECA000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */, - 9F4659A623624EBF000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */, 9F5C18B4230DDBEE00E3E5A7 /* RCTBaseTextShadowView.h in Copy Headers */, 9F5C18B5230DDBEE00E3E5A7 /* RCTBaseTextViewManager.h in Copy Headers */, 9F5C18B2230DDBDE00E3E5A7 /* RCTRawTextShadowView.h in Copy Headers */, @@ -213,8 +213,6 @@ dstPath = include/RCTText; dstSubfolderSpec = 16; files = ( - 9F46597D23623E2D000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */, - 9F46597C23623E14000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */, 5970936920845EFC00D163A7 /* RCTTextTransform.h in Copy Headers */, 5956B160200FF324008D9D16 /* RCTBaseTextShadowView.h in Copy Headers */, 5956B161200FF324008D9D16 /* RCTBaseTextViewManager.h in Copy Headers */, @@ -285,6 +283,8 @@ dstPath = include/React; dstSubfolderSpec = 16; files = ( + 9F4659E42362634A000929DF /* RCTBackedTextInputDelegate.h in Copy Headers */, + 9F4659E52362634A000929DF /* RCTBackedTextInputViewProtocol.h in Copy Headers */, ); name = "Copy Headers"; runOnlyForDeploymentPostprocessing = 0; From ca87f3610efc967c080a34d0eedd2f1624a8ffdf Mon Sep 17 00:00:00 2001 From: Christopher Hogan Date: Fri, 25 Oct 2019 10:56:21 -0700 Subject: [PATCH 4/5] Mac VM environment error requires we disable mac integration tests to unblock the 60 merge progress --- RNTester/RNTesterIntegrationTests/RCTLoggingTests.m | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m b/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m index 020aa1b99687c4..95a7ce8c59927a 100644 --- a/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m +++ b/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m @@ -17,6 +17,12 @@ @interface RCTLoggingTests : XCTestCase @end +/* +TODO: There's a build failure on ADO Mac VMs where XCodeHelper lost Accessibility permission to control the computer. The issue is tracked here +https://developercommunity.visualstudio.com/content/problem/788271/xcode-helper-not-configured-for-accessibility-on-m.html + To unblock Mac loop builds, we need to temporarily disable integration tests since they consistently fail without proper access. Once the ticket is resolved, we can uncomment the tests below. + */ +/* @implementation RCTLoggingTests { RCTBridge *_bridge; @@ -126,3 +132,4 @@ - (void)testLogging } @end +*/ From e6f837eba4ad328b4105a03631f1286de4348574 Mon Sep 17 00:00:00 2001 From: Christopher Hogan Date: Fri, 25 Oct 2019 11:45:25 -0700 Subject: [PATCH 5/5] Add support for debug/release builds and on iOS, run tests only for iOS debug for now. disable them for Mac debug/release --- .ado/apple-pr.yml | 10 +++++++++- .ado/templates/apple-job-react-native.yml | 7 ++++--- RNTester/RNTesterIntegrationTests/RCTLoggingTests.m | 7 ------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.ado/apple-pr.yml b/.ado/apple-pr.yml index a04ebf360230ff..18edea39fcae29 100644 --- a/.ado/apple-pr.yml +++ b/.ado/apple-pr.yml @@ -16,6 +16,8 @@ jobs: xcode_sdk: iphonesimulator xcode_scheme: 'RNTester' xcode_destination: 'platform=iOS Simulator,OS=latest,name=iPhone 8' + xcode_actions_debug: 'build test' + xcode_actions_release: 'build' # Microsoft- We don't use tvOS, so don't bother maintaining the infra # tvos: # packager_platform: 'ios' @@ -27,6 +29,11 @@ jobs: xcode_sdk: macosx xcode_scheme: 'RNTester-macOS' xcode_destination: 'platform=macOS,arch=x86_64' +# TODO: There's a build failure on ADO Mac VMs where XCodeHelper lost Accessibility permission to control the computer. The issue is tracked here +# https://developercommunity.visualstudio.com/content/problem/788271/xcode-helper-not-configured-for-accessibility-on-m.html +# To unblock Mac loop builds, we need to temporarily disable integration tests since they consistently fail without proper access. Once the ticket is resolved, we can uncomment the tests below. + xcode_actions_debug: 'build' + xcode_actions_release: 'build' pool: vmImage: macOS-10.14 demands: ['xcode', 'sh', 'npm'] @@ -39,5 +46,6 @@ jobs: xcode_sdk: $(xcode_sdk) xcode_configuration: $(xcode_configuration) xcode_scheme: $(xcode_scheme) - xcode_actions: $(xcode_actions) + xcode_actions_debug: $(xcode_actions_debug) + xcode_actions_release: $(xcode_actions_release) xcode_destination: $(xcode_destination) diff --git a/.ado/templates/apple-job-react-native.yml b/.ado/templates/apple-job-react-native.yml index b18a2e0b0d2e7a..ba1537400952b8 100644 --- a/.ado/templates/apple-job-react-native.yml +++ b/.ado/templates/apple-job-react-native.yml @@ -3,7 +3,8 @@ parameters: xcode_sdk: '' xcode_configuration: '' xcode_scheme: '' - xcode_actions: '' + xcode_actions_debug: '' + xcode_actions_release: '' xcode_destination: '' steps: @@ -46,7 +47,7 @@ steps: xcode_configuration: Debug xcode_workspacePath: RNTester/RNTester.xcodeproj xcode_scheme: ${{ parameters.xcode_scheme }} - xcode_actions: 'build test' + xcode_actions: ${{ parameters.xcode_actions_debug }} xcode_useXcpretty: true xcode_destination: ${{ parameters.xcode_destination }} @@ -56,7 +57,7 @@ steps: xcode_configuration: Release xcode_workspacePath: RNTester/RNTester.xcodeproj xcode_scheme: ${{ parameters.xcode_scheme }} - xcode_actions: 'build' + xcode_actions: ${{ parameters.xcode_actions_release }} xcode_useXcpretty: false xcode_destination: ${{ parameters.xcode_destination }} diff --git a/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m b/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m index 95a7ce8c59927a..020aa1b99687c4 100644 --- a/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m +++ b/RNTester/RNTesterIntegrationTests/RCTLoggingTests.m @@ -17,12 +17,6 @@ @interface RCTLoggingTests : XCTestCase @end -/* -TODO: There's a build failure on ADO Mac VMs where XCodeHelper lost Accessibility permission to control the computer. The issue is tracked here -https://developercommunity.visualstudio.com/content/problem/788271/xcode-helper-not-configured-for-accessibility-on-m.html - To unblock Mac loop builds, we need to temporarily disable integration tests since they consistently fail without proper access. Once the ticket is resolved, we can uncomment the tests below. - */ -/* @implementation RCTLoggingTests { RCTBridge *_bridge; @@ -132,4 +126,3 @@ - (void)testLogging } @end -*/