diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined index 3a86abcaab..c8d5fd5582 100644 --- a/ci/Jenkinsfile.combined +++ b/ci/Jenkinsfile.combined @@ -39,9 +39,9 @@ pipeline { stage('iOS') { steps { script { ios = cmn.buildBranch('status-react/combined/mobile-ios') } } } - stage('iOS e2e') { steps { script { - iose2e = cmn.buildBranch('status-react/combined/mobile-ios-e2e') - } } } + //stage('iOS e2e') { steps { script { + // iose2e = cmn.buildBranch('status-react/combined/mobile-ios-e2e') + //} } } stage('Android') { steps { script { apk = cmn.buildBranch('status-react/combined/mobile-android') } } } diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e4aa249f97..a4f30e7771 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -70,6 +70,8 @@ def build_ios_adhoc(readonly) configuration: "Release", clean: true, export_method: "ad-hoc", + # Temporary fix for Xcode 10.1 + xcargs: "-UseModernBuildSystem=N", output_directory: "status-adhoc" ) end @@ -106,6 +108,8 @@ def build_ios_e2e scheme: "StatusIm", workspace: "ios/StatusIm.xcworkspace", configuration: "Release", + # Temporary fix for Xcode 10.1 + xcargs: "-UseModernBuildSystem=N", # Simulator apps can't be archived... skip_archive: true, # ...and we don't need an .ipa file for them, because we use .app directly @@ -178,6 +182,8 @@ platform :ios do clean: true, export_method: "app-store", output_directory: "status_appstore", + # Temporary fix for Xcode 10.1 + xcargs: "-UseModernBuildSystem=N", export_options: { "combileBitcode": true, "uploadBitcode": false,