This is an automated email from the ASF dual-hosted git repository.
dpogue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-ios.git
The following commit(s) were added to refs/heads/master by this push:
new f7703ec (iOS) Skip Cocoapods checkTool on non-darwin platform (#1018)
f7703ec is described below
commit f7703ecad8f6b60c8235ad1e01021b6a7cb94365
Author: AdamLak <49557407+adam...@users.noreply.github.com>
AuthorDate: Wed Nov 25 17:39:32 2020 +0100
(iOS) Skip Cocoapods checkTool on non-darwin platform (#1018)
---
bin/templates/scripts/cordova/lib/check_reqs.js | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/bin/templates/scripts/cordova/lib/check_reqs.js
b/bin/templates/scripts/cordova/lib/check_reqs.js
index 33dc684..83f5f6f 100644
--- a/bin/templates/scripts/cordova/lib/check_reqs.js
+++ b/bin/templates/scripts/cordova/lib/check_reqs.js
@@ -68,7 +68,14 @@ function os_platform_is_supported () {
* @return {Promise} Returns a promise either resolved or rejected
*/
module.exports.check_cocoapods = toolChecker => {
- return checkTool('pod', COCOAPODS_MIN_VERSION,
COCOAPODS_NOT_FOUND_MESSAGE, 'CocoaPods');
+ if (os_platform_is_supported()) {
+ return checkTool('pod', COCOAPODS_MIN_VERSION,
COCOAPODS_NOT_FOUND_MESSAGE, 'CocoaPods');
+ }
+
+ return Promise.resolve({
+ ignore: true,
+ ignoreMessage: `CocoaPods check and installation ignored on
${process.platform}`
+ });
};
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
