From d3178eef7b9645a2466e8bd51df98da6d2c43624 Mon Sep 17 00:00:00 2001 From: ShenYj Date: Tue, 9 Nov 2021 11:36:49 +0800 Subject: [PATCH 1/8] update xcode to 13.1.0 for circle ci - [x] update CircleCI config - update Xcode Version to 13.1.0 from 11.4.1 - [Supported Xcode Versions section of the Testing iOS](https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions) --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3bd6988..a7e9357 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: XCODE_TEST_REPORTS: /tmp/xcode-test-results LANG: en_US.UTF-8 macos: - xcode: '11.4.1' + xcode: '13.1.0' steps: - checkout - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS $XCODE_TEST_REPORTS From e0671117508d61237ccc91bce070ebfe5b50bed8 Mon Sep 17 00:00:00 2001 From: ShenYj Date: Tue, 9 Nov 2021 11:43:17 +0800 Subject: [PATCH 2/8] use xcframework --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a7e9357..98f67e1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: - v1-dep- - run: name: Bootstrap Carthage - command: carthage update --no-use-binaries + command: carthage update --use-xcframeworks - save_cache: key: v1-dep-{{ .Branch }}-{{ epoch }} paths: From 683f983b39a0344c168cbfc03d5c7df98113eb84 Mon Sep 17 00:00:00 2001 From: ShenYj Date: Tue, 9 Nov 2021 11:56:55 +0800 Subject: [PATCH 3/8] update swift version to 5.5 from 5.2.2 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 98f67e1..384d7c7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,14 +28,14 @@ jobs: - run: name: Build (Swift 5.0) command: > - set -o pipefail && xcodebuild build SWIFT_VERSION=5.2.2 + set -o pipefail && xcodebuild build SWIFT_VERSION=5.5 -workspace RxWebKit.xcworkspace -scheme 'RxWebKit' -sdk iphonesimulator -destination "name=iPhone 11" | xcpretty -c - run: name: Run Tests (Swift 5.0) command: > - set -o pipefail && xcodebuild test SWIFT_VERSION=5.2.2 + set -o pipefail && xcodebuild test SWIFT_VERSION=5.5 -workspace RxWebKit.xcworkspace -scheme 'RxWebKitTests-iOS' -sdk iphonesimulator -destination "name=iPhone 11" | xcpretty -c --test From eab9e72a7fe3175b256eaf3884559439a9e89e57 Mon Sep 17 00:00:00 2001 From: ShenYj Date: Tue, 9 Nov 2021 16:11:08 +0800 Subject: [PATCH 4/8] carthage command --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 384d7c7..9bec6c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,10 @@ jobs: - v1-dep- - run: name: Bootstrap Carthage - command: carthage update --use-xcframeworks + command: | + brew update + brew upgrade carthage + carthage update --use-xcframeworks - save_cache: key: v1-dep-{{ .Branch }}-{{ epoch }} paths: From 4c656dce30f16be7613eaa927b5240fd37cee9df Mon Sep 17 00:00:00 2001 From: ShenYj Date: Mon, 22 Nov 2021 21:33:12 +0800 Subject: [PATCH 5/8] Split the build tasks for different instruction sets --- .circleci/config.yml | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9bec6c4..5592783 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ jobs: command: | brew update brew upgrade carthage - carthage update --use-xcframeworks + carthage bootstrap --use-xcframeworks - save_cache: key: v1-dep-{{ .Branch }}-{{ epoch }} paths: @@ -35,13 +35,34 @@ jobs: -workspace RxWebKit.xcworkspace -scheme 'RxWebKit' -sdk iphonesimulator -destination "name=iPhone 11" | xcpretty -c + - run: + name: Build macOS (Swift 5.0) + command: | + set -o pipefail && xcodebuild build SWIFT_VERSION=5.5.1 + -workspace RxWebKit.xcworkspace + -scheme RxWebKit -sdk macosx + -destination "arch=x86_64" | xcpretty -c + - run: + name: Build iOS (Swift 5.0) + command: | + set -o pipefail && xcodebuild build SWIFT_VERSION=5.5.1 + -workspace RxWebKit.xcworkspace + -scheme RxWebKit -sdk iphonesimulator + -destination "name=iPhone 12" | xcpretty -c + - run: + name: Build tvOS (Swift 5.0) + command: | + set -o pipefail && xcodebuild build SWIFT_VERSION=5.5.1 + -workspace RxWebKit.xcworkspace + -scheme RxWebKit -sdk appletvsimulator + -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c - run: name: Run Tests (Swift 5.0) command: > - set -o pipefail && xcodebuild test SWIFT_VERSION=5.5 + set -o pipefail && xcodebuild test SWIFT_VERSION=5.5.1 -workspace RxWebKit.xcworkspace -scheme 'RxWebKitTests-iOS' -sdk iphonesimulator - -destination "name=iPhone 11" | xcpretty -c --test + -destination "name=iPhone 12" | xcpretty -c --test - store_artifacts: path: /tmp/xcode-test-results workflows: @@ -52,3 +73,4 @@ workflows: filters: tags: ignore: /[0-9]+(\.[0-9]+)*/ + \ No newline at end of file From 1e64a8f3ac80a39f5f6503d9997099b75441af2f Mon Sep 17 00:00:00 2001 From: ShenYj Date: Mon, 22 Nov 2021 21:53:55 +0800 Subject: [PATCH 6/8] carthage update --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5592783..e60f068 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ jobs: command: | brew update brew upgrade carthage - carthage bootstrap --use-xcframeworks + carthage update --use-xcframeworks - save_cache: key: v1-dep-{{ .Branch }}-{{ epoch }} paths: From f09ca776c4dfaf1b5af0d6532c76cd8c547626db Mon Sep 17 00:00:00 2001 From: ShenYj Date: Mon, 22 Nov 2021 22:09:34 +0800 Subject: [PATCH 7/8] remove the old script --- .circleci/config.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e60f068..61ac9b4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,13 +28,6 @@ jobs: key: v1-dep-{{ .Branch }}-{{ epoch }} paths: - Carthage - - run: - name: Build (Swift 5.0) - command: > - set -o pipefail && xcodebuild build SWIFT_VERSION=5.5 - -workspace RxWebKit.xcworkspace - -scheme 'RxWebKit' -sdk iphonesimulator - -destination "name=iPhone 11" | xcpretty -c - run: name: Build macOS (Swift 5.0) command: | From fa21119a6d3a229f1920df08089fb631fe6c813d Mon Sep 17 00:00:00 2001 From: ShenYj Date: Tue, 30 Nov 2021 21:58:13 +0800 Subject: [PATCH 8/8] fix --- .circleci/config.yml | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61ac9b4..ddbfbaf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,32 +30,17 @@ jobs: - Carthage - run: name: Build macOS (Swift 5.0) - command: | - set -o pipefail && xcodebuild build SWIFT_VERSION=5.5.1 - -workspace RxWebKit.xcworkspace - -scheme RxWebKit -sdk macosx - -destination "arch=x86_64" | xcpretty -c + command: set -o pipefail && xcodebuild build SWIFT_VERSION=5.5.1 -workspace RxWebKit.xcworkspace -scheme RxWebKit -sdk macosx -destination "arch=x86_64" | xcpretty -c - run: name: Build iOS (Swift 5.0) - command: | - set -o pipefail && xcodebuild build SWIFT_VERSION=5.5.1 - -workspace RxWebKit.xcworkspace - -scheme RxWebKit -sdk iphonesimulator - -destination "name=iPhone 12" | xcpretty -c + command: set -o pipefail && xcodebuild build SWIFT_VERSION=5.5.1 -workspace RxWebKit.xcworkspace -scheme RxWebKit -sdk iphonesimulator -destination "name=iPhone 12" | xcpretty -c + - run: name: Build tvOS (Swift 5.0) - command: | - set -o pipefail && xcodebuild build SWIFT_VERSION=5.5.1 - -workspace RxWebKit.xcworkspace - -scheme RxWebKit -sdk appletvsimulator - -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c + command: set -o pipefail && xcodebuild build SWIFT_VERSION=5.5.1 -workspace RxWebKit.xcworkspace -scheme RxWebKit -sdk appletvsimulator -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c - run: name: Run Tests (Swift 5.0) - command: > - set -o pipefail && xcodebuild test SWIFT_VERSION=5.5.1 - -workspace RxWebKit.xcworkspace - -scheme 'RxWebKitTests-iOS' -sdk iphonesimulator - -destination "name=iPhone 12" | xcpretty -c --test + command: set -o pipefail && xcodebuild test SWIFT_VERSION=5.5.1 -workspace RxWebKit.xcworkspace -scheme 'RxWebKitTests-iOS' -sdk iphonesimulator -destination "name=iPhone 12" | xcpretty -c --test - store_artifacts: path: /tmp/xcode-test-results workflows: