From 0a1e84833d604ca28b769718c29e1ac07832ea35 Mon Sep 17 00:00:00 2001 From: Alban Diquet Date: Sat, 16 Feb 2019 17:35:11 -0800 Subject: [PATCH 1/5] Add default circle ci 2.0 file --- circle.yml | 61 ++++++++++++++++++++++-------------------------------- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/circle.yml b/circle.yml index 5bc38314..dc4ab0c7 100644 --- a/circle.yml +++ b/circle.yml @@ -1,37 +1,26 @@ -machine: - xcode: - version: 9.2.0 -test: - override: - # iOS 10.0 platform with iOS 11.2 SDK - - xcodebuild clean test - CODE_SIGNING_REQUIRED=NO - CODE_SIGN_IDENTITY= - -destination 'platform=iOS Simulator,name=iPhone 5,OS=10.3.1' - -sdk iphonesimulator11.2 - -scheme "TrustKit" - - # iOS 11.2 platform with iOS 11.2 SDK - - xcodebuild clean test - CODE_SIGNING_REQUIRED=NO - CODE_SIGN_IDENTITY= - -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' - -sdk iphonesimulator11.2 - -scheme "TrustKit" - - # macOS 10.13 platform with macOS 10.13 SDK - - xcodebuild clean test - CODE_SIGNING_REQUIRED=NO - CODE_SIGN_IDENTITY= - -destination 'platform=OS X' - -sdk macosx10.13 - -scheme "TrustKit OS X" +version: 2 +jobs: + build-and-test: + macos: + xcode: "10.1" + working_directory: /Users/distiller/project + environment: + FL_OUTPUT_DIR: output - # tvOS 11.2 platform with tvOS 11.2 SDK - - xcodebuild clean test - CODE_SIGNING_REQUIRED=NO - CODE_SIGN_IDENTITY= - -destination 'platform=tvOS Simulator,name=Apple TV,OS=11.2' - -sdk appletvsimulator11.2 - -scheme "TrustKit tvOS" - \ No newline at end of file + - run: + name: Build and run tests + command: fastlane scan + environment: + SCAN_DEVICE: iPhone 8 + SCAN_SCHEME: WebTests + + - store_test_results: + path: output/scan + - store_artifacts: + path: output + +workflows: + version: 2 + build-and-test: + jobs: + - build-and-test From 682e81eac9851b95085a5ef50f92e417327e0379 Mon Sep 17 00:00:00 2001 From: Alban Diquet Date: Sat, 16 Feb 2019 17:41:16 -0800 Subject: [PATCH 2/5] Fix CI --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index dc4ab0c7..ea07961b 100644 --- a/circle.yml +++ b/circle.yml @@ -7,13 +7,13 @@ jobs: environment: FL_OUTPUT_DIR: output + steps: - run: name: Build and run tests command: fastlane scan environment: SCAN_DEVICE: iPhone 8 SCAN_SCHEME: WebTests - - store_test_results: path: output/scan - store_artifacts: From 92c2ff58c0f3ff231d07fca97c48aa169cbe03b8 Mon Sep 17 00:00:00 2001 From: Alban Diquet Date: Sat, 16 Feb 2019 17:42:47 -0800 Subject: [PATCH 3/5] Fix CI --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index ea07961b..b6510573 100644 --- a/circle.yml +++ b/circle.yml @@ -2,7 +2,7 @@ version: 2 jobs: build-and-test: macos: - xcode: "10.1" + xcode: "10.1.0" working_directory: /Users/distiller/project environment: FL_OUTPUT_DIR: output From 60efbe637298f630464cb5987764c469731fdc78 Mon Sep 17 00:00:00 2001 From: Alban Diquet Date: Sat, 16 Feb 2019 17:47:05 -0800 Subject: [PATCH 4/5] Fix CI --- circle.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index b6510573..bf7fcfac 100644 --- a/circle.yml +++ b/circle.yml @@ -10,10 +10,7 @@ jobs: steps: - run: name: Build and run tests - command: fastlane scan - environment: - SCAN_DEVICE: iPhone 8 - SCAN_SCHEME: WebTests + command: fastlane tests - store_test_results: path: output/scan - store_artifacts: From bad7c2c2cb2c63d83a6252ef2f2395d7cc80f2e5 Mon Sep 17 00:00:00 2001 From: Alban Diquet Date: Sat, 16 Feb 2019 19:08:35 -0800 Subject: [PATCH 5/5] Switch to bitrise --- README.md | 2 +- circle.yml | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 circle.yml diff --git a/README.md b/README.md index 1cb3e311..1b63ac7c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ TrustKit ======== -[![Build Status](https://circleci.com/gh/datatheorem/TrustKit.svg?style=svg)](https://circleci.com/gh/datatheorem/TrustKit) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Version Status](https://img.shields.io/cocoapods/v/TrustKit.svg?style=flat)](https://cocoapods.org/pods/TrustKit) [![Platform](https://img.shields.io/cocoapods/p/TrustKit.svg?style=flat)](https://cocoapods.org/pods/TrustKit) [![License MIT](https://img.shields.io/cocoapods/l/TrustKit.svg?style=flat)](https://en.wikipedia.org/wiki/MIT_License) +[![Build Status](https://app.bitrise.io/app/fe29405fb90f94ea/status.svg?token=TJ3o4dhSWa--0ZlJT7FV1A)](https://app.bitrise.io/app/fe29405fb90f94ea) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![Version Status](https://img.shields.io/cocoapods/v/TrustKit.svg?style=flat)](https://cocoapods.org/pods/TrustKit) [![Platform](https://img.shields.io/cocoapods/p/TrustKit.svg?style=flat)](https://cocoapods.org/pods/TrustKit) [![License MIT](https://img.shields.io/cocoapods/l/TrustKit.svg?style=flat)](https://en.wikipedia.org/wiki/MIT_License) [![Gitter chat](https://badges.gitter.im/datatheorem/gitter.png)](https://gitter.im/TrustKit/Lobby) **TrustKit** is an open source framework that makes it easy to deploy SSL public key pinning and reporting in any iOS 10+, macOS 10.10+, tvOS 10+ or watchOS 3+ App; it supports both Swift and Objective-C Apps. diff --git a/circle.yml b/circle.yml deleted file mode 100644 index bf7fcfac..00000000 --- a/circle.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: 2 -jobs: - build-and-test: - macos: - xcode: "10.1.0" - working_directory: /Users/distiller/project - environment: - FL_OUTPUT_DIR: output - - steps: - - run: - name: Build and run tests - command: fastlane tests - - store_test_results: - path: output/scan - - store_artifacts: - path: output - -workflows: - version: 2 - build-and-test: - jobs: - - build-and-test