From ae81f1c838363f4f62b4091cd8c4f77094f6053a Mon Sep 17 00:00:00 2001 From: James Treanor Date: Tue, 8 Oct 2019 14:31:17 +0100 Subject: [PATCH 1/2] CircleCI: Use --include-podspecs when validating WordPress-Editor-iOS.podspec to avoid publishing problems --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c30b3bf15..c78dde06f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 orbs: # This uses the iOS Orb located at https://github.com/wordpress-mobile/circleci-orbs - ios: wordpress-mobile/ios@0.0.35 + ios: wordpress-mobile/ios@dev:cocoapods-addtional-options workflows: test_and_validate: @@ -28,8 +28,8 @@ workflows: name: Validate WordPress-Editor-iOS.podspec xcode-version: "11.0" podspec-path: WordPress-Editor-iOS.podspec - # Updating specs is needed since WordPress-Editor-iOS depends on WordPress-Aztec-iOS - update-specs-repo: true + # Reference WordPress-Aztec-iOS.podspec locally so we don't have to get it from the specs repo + additional-parameters: --include-podspecs=WordPress-Aztec-iOS.podspec - ios/publish-podspec: name: Publish WordPress-Aztec-iOS to Trunk From 4aa260aeacd47dac48913154df4798781f9e3619 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Wed, 9 Oct 2019 09:45:46 +0100 Subject: [PATCH 2/2] Use published Orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c78dde06f..bf7ef87f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 orbs: # This uses the iOS Orb located at https://github.com/wordpress-mobile/circleci-orbs - ios: wordpress-mobile/ios@dev:cocoapods-addtional-options + ios: wordpress-mobile/ios@0.0.36 workflows: test_and_validate: