From f15f16be708d88b3eb70f929669f0bef8a833279 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Thu, 13 Jul 2023 15:35:35 +1000 Subject: [PATCH] More CI tweaks Updated the Podfile to use the CocoaPods CDN (hopefully much faster than the master spec repo) Removed the custom derivedDataPath (seemed to break the Copy Frameworks step of CocoaPods) --- .drone.jsonnet | 8 ++++---- Podfile | 3 ++- Podfile.lock | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 07634ce4c..16946af5d 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -58,9 +58,9 @@ local install_cocoapods = { 'mkdir build', ||| if command -v xcpretty >/dev/null 2>&1; then - xcodebuild archive -workspace Session.xcworkspace -scheme Session -configuration 'App Store Release' -sdk iphonesimulator -derivedDataPath ./build -archivePath ./build/Session_sim.xcarchive -destination 'generic/platform=iOS Simulator' | xcpretty + xcodebuild archive -workspace Session.xcworkspace -scheme Session -configuration 'App Store Release' -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination 'generic/platform=iOS Simulator' | xcpretty else - xcodebuild archive -workspace Session.xcworkspace -scheme Session -configuration 'App Store Release' -sdk iphonesimulator -derivedDataPath ./build -archivePath ./build/Session_sim.xcarchive -destination 'generic/platform=iOS Simulator' + xcodebuild archive -workspace Session.xcworkspace -scheme Session -configuration 'App Store Release' -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination 'generic/platform=iOS Simulator' fi ||| ], @@ -88,9 +88,9 @@ local install_cocoapods = { 'mkdir build', ||| if command -v xcpretty >/dev/null 2>&1; then - xcodebuild archive -workspace Session.xcworkspace -scheme Session -configuration 'App Store Release' -sdk iphoneos -derivedDataPath ./build -archivePath ./build/Session.xcarchive -destination 'generic/platform=iOS' | xcpretty + xcodebuild archive -workspace Session.xcworkspace -scheme Session -configuration 'App Store Release' -sdk iphoneos -archivePath ./build/Session.xcarchive -destination 'generic/platform=iOS' | xcpretty else - xcodebuild archive -workspace Session.xcworkspace -scheme Session -configuration 'App Store Release' -sdk iphoneos -derivedDataPath ./build -archivePath ./build/Session.xcarchive -destination 'generic/platform=iOS' + xcodebuild archive -workspace Session.xcworkspace -scheme Session -configuration 'App Store Release' -sdk iphoneos -archivePath ./build/Session.xcarchive -destination 'generic/platform=iOS' fi ||| ], diff --git a/Podfile b/Podfile index 76cf57a85..69fbc174f 100644 --- a/Podfile +++ b/Podfile @@ -1,9 +1,10 @@ platform :ios, '13.0' -source 'https://github.com/CocoaPods/Specs.git' use_frameworks! inhibit_all_warnings! +install! 'cocoapods', :warn_for_unused_master_specs_repo => false + # Dependencies to be included in the app and all extensions/frameworks abstract_target 'GlobalDependencies' do # FIXME: If https://github.com/jedisct1/swift-sodium/pull/249 gets resolved then revert this back to the standard pod diff --git a/Podfile.lock b/Podfile.lock index d0b6c6490..a2e1e4dae 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -198,6 +198,6 @@ SPEC CHECKSUMS: YapDatabase: b418a4baa6906e8028748938f9159807fd039af4 YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331 -PODFILE CHECKSUM: 4705728e69454d50805c70272479a7d4a04209d5 +PODFILE CHECKSUM: f56c28baefe3077effcb3a2ea5941b52c4cc6e86 COCOAPODS: 1.12.1