From d6935807450a3112064d6d9e1240b6e9033604f6 Mon Sep 17 00:00:00 2001 From: Godefroy Ponsinet Date: Wed, 21 Aug 2019 11:45:27 +0200 Subject: [PATCH] fix(ci): ios integration test Signed-off-by: Godefroy Ponsinet --- client/Makefile | 24 ++++++++++++++++++---- client/ios/Berty.xcodeproj/project.pbxproj | 1 - client/ios/Podfile.lock | 2 +- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/client/Makefile b/client/Makefile index 305269f2c1..faf2a340da 100644 --- a/client/Makefile +++ b/client/Makefile @@ -286,7 +286,11 @@ fclean.osx: .PHONY: debug.ios debug.ios: deps.ios get_iphone_udid make debug.react-native - $(RN) run-ios --no-packager --configuration=Debug --scheme=debug $(IOS_UDID) + $(RN) run-ios \ + --no-packager \ + --configuration=Debug \ + --scheme=debug \ + $(IOS_UDID) .PHONY: test.debug.ios test.debug.ios: RN = cavy @@ -295,7 +299,11 @@ test.debug.ios: debug.ios .PHONY: release.ios release.ios: deps.ios get_iphone_udid - $(RN) run-ios --no-packager --configuration=Release --scheme=release $(IOS_UDID) + $(RN) run-ios \ + --no-packager \ + --configuration=Release \ + --scheme=release \ + $(IOS_UDID) .PHONY: test.release.ios test.release.ios: RN = cavy @@ -304,7 +312,11 @@ test.release.ios: release.ios .PHONY: adhoc.ios adhoc.ios: deps.ios get_iphone_udid - $(RN) run-ios --no-packager --configuration=Release --scheme=adhoc $(IOS_UDID) + $(RN) run-ios \ + --no-packager \ + --configuration=adhoc \ + --scheme=adhoc \ + $(IOS_UDID) .PHONY: test.adhoc.ios test.adhoc.ios: RN = cavy @@ -313,7 +325,11 @@ test.adhoc.ios: adhoc.ios .PHONY: house.ios house.ios: deps.ios get_iphone_udid - $(RN) run-ios --no-packager --configuration=Release --scheme=house $(IOS_UDID) + $(RN) run-ios \ + --no-packager \ + --configuration=house \ + --scheme=house \ + $(IOS_UDID) .PHONY: test.house.ios test.house.ios: RN = cavy diff --git a/client/ios/Berty.xcodeproj/project.pbxproj b/client/ios/Berty.xcodeproj/project.pbxproj index 883584cceb..e381a43348 100644 --- a/client/ios/Berty.xcodeproj/project.pbxproj +++ b/client/ios/Berty.xcodeproj/project.pbxproj @@ -5,7 +5,6 @@ }; objectVersion = 46; objects = { - /* Begin PBXBuildFile section */ 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; diff --git a/client/ios/Podfile.lock b/client/ios/Podfile.lock index 7f69f36890..d207496b86 100644 --- a/client/ios/Podfile.lock +++ b/client/ios/Podfile.lock @@ -298,6 +298,6 @@ SPEC CHECKSUMS: RNViewShot: 5c5b4c5540046e5fb0de4a48a311571816c43c86 yoga: 312528f5bbbba37b4dcea5ef00e8b4033fdd9411 -PODFILE CHECKSUM: 7a2afc389458c64f8a30026a52ad84b27666d61f +PODFILE CHECKSUM: 6c39963c01370fecaddd7e13ad59476531eb7311 COCOAPODS: 1.7.5