From eca300d43f0888373f6494f1c489f953f71f1d5b Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Mon, 9 Mar 2020 05:09:41 -0700 Subject: [PATCH] Refactor oss ios job to not use pod install Summary: This diff adds the ability to run iOS tests without doing pod install in sandcastle. For this, the repo will already have the dependencies archived and checked into the repo. For this I have already added the script, `recreate_offline_mirrors` which takes the first argument, which is the sample app's name, in our case it will be `Sample` and `SampleSwift`. There is one more script `prepare_pods` which untars the dependencies and copies it into the Pods folders. Reason we are moving away from using `pod install` is that internet is unreliable in sandcastle and there have been many instances that the job fails due to flaky internet. Reviewed By: passy Differential Revision: D20136440 fbshipit-source-id: 41028c11da6c66b484f36c7d1090ac7ffd847ec2 --- .gitignore | 2 - iOS/Sample/Podfile.lock | 116 ++++++++++++++++++ .../contents.xcworkspacedata | 10 ++ iOS/SampleSwift/Podfile.lock | 113 +++++++++++++++++ .../contents.xcworkspacedata | 10 ++ iOS/Tutorial/Podfile.lock | 105 ++++++++++++++++ .../contents.xcworkspacedata | 10 ++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ 8 files changed, 372 insertions(+), 2 deletions(-) create mode 100644 iOS/Sample/Podfile.lock create mode 100644 iOS/Sample/Sample.xcworkspace/contents.xcworkspacedata create mode 100644 iOS/SampleSwift/Podfile.lock create mode 100644 iOS/SampleSwift/SampleSwift.xcworkspace/contents.xcworkspacedata create mode 100644 iOS/Tutorial/Podfile.lock create mode 100644 iOS/Tutorial/Tutorial.xcworkspace/contents.xcworkspacedata create mode 100644 iOS/Tutorial/Tutorial.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.gitignore b/.gitignore index b90fe92f7..ba3865dce 100644 --- a/.gitignore +++ b/.gitignore @@ -8,11 +8,9 @@ static/main.bundle.* .watchmanconfig # iOS / Xcode -*.xcworkspace **/Pods/ **/xcuserdata/ build/ -Podfile.lock android/third-party/external/ diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock new file mode 100644 index 000000000..bb144d457 --- /dev/null +++ b/iOS/Sample/Podfile.lock @@ -0,0 +1,116 @@ +PODS: + - boost-for-react-native (1.63.0) + - CocoaAsyncSocket (7.6.4) + - CocoaLibEvent (1.0.0) + - ComponentKit (0.29): + - Yoga (~> 1.14) + - Flipper (0.32.2): + - Flipper-Folly (~> 2.1) + - Flipper-RSocket (~> 1.0) + - Flipper-DoubleConversion (1.1.7) + - Flipper-Folly (2.1.1): + - boost-for-react-native + - CocoaLibEvent (~> 1.0) + - Flipper-DoubleConversion + - Flipper-Glog + - OpenSSL-Universal (= 1.0.2.19) + - Flipper-Glog (0.3.6) + - Flipper-PeerTalk (0.0.4) + - Flipper-RSocket (1.0.0): + - Flipper-Folly (~> 2.0) + - FlipperKit (0.32.2): + - FlipperKit/Core (= 0.32.2) + - FlipperKit/Core (0.32.2): + - Flipper (~> 0.32.2) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - FlipperKit/CppBridge (0.32.2): + - Flipper (~> 0.32.2) + - FlipperKit/FBCxxFollyDynamicConvert (0.32.2): + - Flipper-Folly (~> 2.1) + - FlipperKit/FBDefines (0.32.2) + - FlipperKit/FKPortForwarding (0.32.2): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitExamplePlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay (0.32.2) + - FlipperKit/FlipperKitLayoutComponentKitSupport (0.32.2): + - ComponentKit (~> 0.0) + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutPlugin + - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.32.2) + - FlipperKit/FlipperKitNetworkPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/FlipperKitReactPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin + - OpenSSL-Universal (1.0.2.19): + - OpenSSL-Universal/Static (= 1.0.2.19) + - OpenSSL-Universal/Static (1.0.2.19) + - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) + +DEPENDENCIES: + - Flipper (from `../../Flipper.podspec`) + - FlipperKit (from `../../FlipperKit.podspec`) + - FlipperKit/FlipperKitExamplePlugin (from `../../FlipperKit.podspec`) + - FlipperKit/FlipperKitLayoutComponentKitSupport (from `../../FlipperKit.podspec`) + - FlipperKit/FlipperKitReactPlugin (from `../../FlipperKit.podspec`) + - FlipperKit/FlipperKitUserDefaultsPlugin (from `../../FlipperKit.podspec`) + - FlipperKit/SKIOSNetworkPlugin (from `../../FlipperKit.podspec`) + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - boost-for-react-native + - CocoaAsyncSocket + - CocoaLibEvent + - ComponentKit + - Flipper-DoubleConversion + - Flipper-Folly + - Flipper-Glog + - Flipper-PeerTalk + - Flipper-RSocket + - OpenSSL-Universal + - Yoga + - YogaKit + +EXTERNAL SOURCES: + Flipper: + :path: "../../Flipper.podspec" + FlipperKit: + :path: "../../FlipperKit.podspec" + +SPEC CHECKSUMS: + boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c + CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 + CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f + ComponentKit: f8ceb6ffdf33e0c229eac8aadac5df2329902d41 + Flipper: 7694a9d92c67a921aae7adb24c92017e07565734 + Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 + Flipper-Folly: 2de3d03e0acc7064d5e4ed9f730e2f217486f162 + Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + Flipper-RSocket: 1260a31c05c238eabfa9bb8a64e3983049048371 + FlipperKit: 16c1f57eb5b3e726196508b1b23018a7577f6730 + OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 + Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a + +PODFILE CHECKSUM: 20ef0dc9bc0640a45418e4bab650eca0a0a4f0c4 + +COCOAPODS: 1.6.1 diff --git a/iOS/Sample/Sample.xcworkspace/contents.xcworkspacedata b/iOS/Sample/Sample.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..7b5a2f305 --- /dev/null +++ b/iOS/Sample/Sample.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/iOS/SampleSwift/Podfile.lock b/iOS/SampleSwift/Podfile.lock new file mode 100644 index 000000000..4012badaa --- /dev/null +++ b/iOS/SampleSwift/Podfile.lock @@ -0,0 +1,113 @@ +PODS: + - boost-for-react-native (1.63.0) + - CocoaAsyncSocket (7.6.4) + - CocoaLibEvent (1.0.0) + - ComponentKit (0.29): + - Yoga (~> 1.14) + - Flipper (0.32.2): + - Flipper-Folly (~> 2.1) + - Flipper-RSocket (~> 1.0) + - Flipper-DoubleConversion (1.1.7) + - Flipper-Folly (2.1.1): + - boost-for-react-native + - CocoaLibEvent (~> 1.0) + - Flipper-DoubleConversion + - Flipper-Glog + - OpenSSL-Universal (= 1.0.2.19) + - Flipper-Glog (0.3.6) + - Flipper-PeerTalk (0.0.4) + - Flipper-RSocket (1.0.0): + - Flipper-Folly (~> 2.0) + - FlipperKit (0.32.2): + - FlipperKit/Core (= 0.32.2) + - FlipperKit/Core (0.32.2): + - Flipper (~> 0.32.2) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - FlipperKit/CppBridge (0.32.2): + - Flipper (~> 0.32.2) + - FlipperKit/FBCxxFollyDynamicConvert (0.32.2): + - Flipper-Folly (~> 2.1) + - FlipperKit/FBDefines (0.32.2) + - FlipperKit/FKPortForwarding (0.32.2): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitExamplePlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay (0.32.2) + - FlipperKit/FlipperKitLayoutComponentKitSupport (0.32.2): + - ComponentKit (~> 0.0) + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutPlugin + - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.32.2) + - FlipperKit/FlipperKitNetworkPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin + - OpenSSL-Universal (1.0.2.19): + - OpenSSL-Universal/Static (= 1.0.2.19) + - OpenSSL-Universal/Static (1.0.2.19) + - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) + +DEPENDENCIES: + - Flipper (from `../../Flipper.podspec`) + - FlipperKit (from `../../FlipperKit.podspec`) + - FlipperKit/FlipperKitExamplePlugin (from `../../FlipperKit.podspec`) + - FlipperKit/FlipperKitLayoutComponentKitSupport (from `../../FlipperKit.podspec`) + - FlipperKit/FlipperKitUserDefaultsPlugin (from `../../FlipperKit.podspec`) + - FlipperKit/SKIOSNetworkPlugin (from `../../FlipperKit.podspec`) + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - boost-for-react-native + - CocoaAsyncSocket + - CocoaLibEvent + - ComponentKit + - Flipper-DoubleConversion + - Flipper-Folly + - Flipper-Glog + - Flipper-PeerTalk + - Flipper-RSocket + - OpenSSL-Universal + - Yoga + - YogaKit + +EXTERNAL SOURCES: + Flipper: + :path: "../../Flipper.podspec" + FlipperKit: + :path: "../../FlipperKit.podspec" + +SPEC CHECKSUMS: + boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c + CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 + CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f + ComponentKit: f8ceb6ffdf33e0c229eac8aadac5df2329902d41 + Flipper: 7694a9d92c67a921aae7adb24c92017e07565734 + Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 + Flipper-Folly: 2de3d03e0acc7064d5e4ed9f730e2f217486f162 + Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + Flipper-RSocket: 1260a31c05c238eabfa9bb8a64e3983049048371 + FlipperKit: 16c1f57eb5b3e726196508b1b23018a7577f6730 + OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 + Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a + +PODFILE CHECKSUM: 1352f81773f44dee75f6f5460c15edd4e29a2d47 + +COCOAPODS: 1.6.1 diff --git a/iOS/SampleSwift/SampleSwift.xcworkspace/contents.xcworkspacedata b/iOS/SampleSwift/SampleSwift.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..304e0e29a --- /dev/null +++ b/iOS/SampleSwift/SampleSwift.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/iOS/Tutorial/Podfile.lock b/iOS/Tutorial/Podfile.lock new file mode 100644 index 000000000..4edd9e669 --- /dev/null +++ b/iOS/Tutorial/Podfile.lock @@ -0,0 +1,105 @@ +PODS: + - boost-for-react-native (1.63.0) + - CocoaAsyncSocket (7.6.4) + - CocoaLibEvent (1.0.0) + - ComponentKit (0.29): + - Yoga (~> 1.14) + - Flipper (0.32.2): + - Flipper-Folly (~> 2.1) + - Flipper-RSocket (~> 1.0) + - Flipper-DoubleConversion (1.1.7) + - Flipper-Folly (2.1.1): + - boost-for-react-native + - CocoaLibEvent (~> 1.0) + - Flipper-DoubleConversion + - Flipper-Glog + - OpenSSL-Universal (= 1.0.2.19) + - Flipper-Glog (0.3.6) + - Flipper-PeerTalk (0.0.4) + - Flipper-RSocket (1.0.0): + - Flipper-Folly (~> 2.0) + - FlipperKit (0.32.2): + - FlipperKit/Core (= 0.32.2) + - FlipperKit/Core (0.32.2): + - Flipper (~> 0.32.2) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - FlipperKit/CppBridge (0.32.2): + - Flipper (~> 0.32.2) + - FlipperKit/FBCxxFollyDynamicConvert (0.32.2): + - Flipper-Folly (~> 2.1) + - FlipperKit/FBDefines (0.32.2) + - FlipperKit/FKPortForwarding (0.32.2): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitHighlightOverlay (0.32.2) + - FlipperKit/FlipperKitLayoutComponentKitSupport (0.32.2): + - ComponentKit (~> 0.0) + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutPlugin + - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.32.2) + - FlipperKit/FlipperKitNetworkPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.32.2): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin + - OpenSSL-Universal (1.0.2.19): + - OpenSSL-Universal/Static (= 1.0.2.19) + - OpenSSL-Universal/Static (1.0.2.19) + - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) + +DEPENDENCIES: + - FlipperKit (~> 0.32.2) + - FlipperKit/FlipperKitLayoutComponentKitSupport (~> 0.32.2) + - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.32.2) + - FlipperKit/SKIOSNetworkPlugin (~> 0.32.2) + +SPEC REPOS: + trunk: + - boost-for-react-native + - CocoaAsyncSocket + - CocoaLibEvent + - ComponentKit + - Flipper + - Flipper-DoubleConversion + - Flipper-Folly + - Flipper-Glog + - Flipper-PeerTalk + - Flipper-RSocket + - FlipperKit + - OpenSSL-Universal + - Yoga + - YogaKit + +SPEC CHECKSUMS: + boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c + CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 + CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f + ComponentKit: f8ceb6ffdf33e0c229eac8aadac5df2329902d41 + Flipper: 7694a9d92c67a921aae7adb24c92017e07565734 + Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 + Flipper-Folly: 2de3d03e0acc7064d5e4ed9f730e2f217486f162 + Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + Flipper-RSocket: 1260a31c05c238eabfa9bb8a64e3983049048371 + FlipperKit: 16c1f57eb5b3e726196508b1b23018a7577f6730 + OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 + Yoga: cff67a400f6b74dc38eb0bad4f156673d9aa980c + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a + +PODFILE CHECKSUM: 8450c8b24d58fab2aca017064210162c7853fbb7 + +COCOAPODS: 1.9.0 diff --git a/iOS/Tutorial/Tutorial.xcworkspace/contents.xcworkspacedata b/iOS/Tutorial/Tutorial.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..c96d59c6f --- /dev/null +++ b/iOS/Tutorial/Tutorial.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/iOS/Tutorial/Tutorial.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/iOS/Tutorial/Tutorial.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/iOS/Tutorial/Tutorial.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + +