From e4c3026ccec877c83bf1e83465be76f1a11449cc Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Thu, 7 Jan 2021 12:08:28 +0100 Subject: [PATCH 1/3] Update CI configuration for XCode 12 --- .circleci/config.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bf04b6dbd..c6569b798 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,42 +3,42 @@ version: 2.1 orbs: # Using 1.0 of our Orbs means it will use the latest 1.0.x version from https://github.com/wordpress-mobile/circleci-orbs ios: wordpress-mobile/ios@1.0 + git: wordpress-mobile/git@1.0 + +xcode_version: &xcode_version + xcode-version: "12.1.0" + +iphone_test_device: &iphone_test_device + device: iPhone 11 + ios-version: "14.1" workflows: test_and_validate: jobs: - - ios/test: - name: Carthage Update - xcode-version: "12.1.0" - workspace: Aztec.xcworkspace - scheme: CarthageBuild - device: iPhone 11 - - ios/test: name: Test - xcode-version: "12.1.0" + <<: *xcode_version bundle-install: false pod-install: false workspace: Aztec.xcworkspace scheme: AztecExample - device: iPhone 11 - ios-version: "14.0" + <<: *iphone_test_device - ios/validate-podspec: name: Validate WordPress-Aztec-iOS.podspec - xcode-version: "12.1.0" + <<: *xcode_version podspec-path: WordPress-Aztec-iOS.podspec - ios/validate-podspec: name: Validate WordPress-Editor-iOS.podspec - xcode-version: "12.1.0" + <<: *xcode_version podspec-path: WordPress-Editor-iOS.podspec # 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 - xcode-version: "12.1.0" + <<: *xcode_version podspec-path: WordPress-Aztec-iOS.podspec post-to-slack: true filters: @@ -50,7 +50,7 @@ workflows: - ios/publish-podspec: name: Publish WordPress-Editor-iOS to Trunk requires: [ "Publish WordPress-Aztec-iOS to Trunk" ] - xcode-version: "12.1.0" + <<: *xcode_version podspec-path: WordPress-Editor-iOS.podspec post-to-slack: true filters: From c42a7453dc1a9ba861bdc6e1cb86f9c5f3cda329 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Thu, 7 Jan 2021 12:16:54 +0100 Subject: [PATCH 2/3] Use carthage.sh instead of the stock carthage --- Scripts/carthage_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/carthage_script.sh b/Scripts/carthage_script.sh index 70080c842..f6022743f 100755 --- a/Scripts/carthage_script.sh +++ b/Scripts/carthage_script.sh @@ -3,5 +3,5 @@ cd "${PROJECT_DIR}/Example" if [ -d "Carthage/Build/iOS" ]; then echo "Carthage: found dependencies!" else - carthage update + ./carthage.sh update fi From adaac83caa450ca617d184c49cdc1cb42b1a98de Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Thu, 7 Jan 2021 15:03:49 +0100 Subject: [PATCH 3/3] Explicit the platform when invoking carthage --- Scripts/carthage_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/carthage_script.sh b/Scripts/carthage_script.sh index f6022743f..43ec7f2f2 100755 --- a/Scripts/carthage_script.sh +++ b/Scripts/carthage_script.sh @@ -3,5 +3,5 @@ cd "${PROJECT_DIR}/Example" if [ -d "Carthage/Build/iOS" ]; then echo "Carthage: found dependencies!" else - ./carthage.sh update + ./carthage.sh update --platform iOS fi