From 419e2e96d7604e4277b0537bb0400dc4f6c2b7a7 Mon Sep 17 00:00:00 2001 From: Jakub Kaspar Date: Tue, 17 Mar 2020 23:22:01 +0100 Subject: [PATCH 1/2] Get rid of Circle CI and unused travis file --- .circleci/config.yml | 76 -------------------------------------------- .travis.yml | 53 ------------------------------ 2 files changed, 129 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100644 .travis.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index ca1ed1a8..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,76 +0,0 @@ -# Specify the config version -version: 2.1 - -# Define the jobs for the current project -jobs: - build_tests: - macos: - xcode: 11.3.1 - environment: - - DESTINATION: "platform=iOS Simulator,name=iPhone 11 Pro" - # Define the steps required to build the project. - steps: - # Get the code from the VCS provider. - - checkout - - run: - name: Update Homebrew - command: brew update - - run: - name: Bootstrap Carthage - command: carthage bootstrap --platform ios - - run: - # More info about pre-start of the simulator at https://circleci.com/docs/2.0/testing-ios/#pre-starting-the-simulator - name: Pre-start simulator - command: xcrun instruments -w "iPhone 11 Pro (13.3) [" || true - - run: - name: Build framework - command: xcodebuild build -project MessageKit.xcodeproj -scheme MessageKit -destination "$DESTINATION" CODE_SIGNING_REQUIRED=NO | xcpretty -c - - run: - name: Build and run tests - command: xcodebuild test -project MessageKit.xcodeproj -scheme MessageKitTests -destination "$DESTINATION" CODE_SIGNING_REQUIRED=NO | xcpretty -c - - restore_cache: - name: Restore bundle cache - keys: - - 1-gems-{{ arch }}-{{ .Branch }}-{{ checksum "Example/Gemfile.lock" }} - - 1-gems-{{ arch }}-{{ .Branch }}- - - run: - name: Install bundle - command: cd Example && bundle check || bundle install --path vendor/bundle - - save_cache: - name: Save bundle cache - key: 1-gems-{{ arch }}-{{ .Branch }}-{{ checksum "Example/Gemfile.lock" }} - paths: - - vendor/bundle - - restore_cache: - name: Restore Pods cache - keys: - - v1-pods-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Example/Podfile.lock" }} - - v1-pods-cache-{{ arch }}-{{ .Branch }}- - - run: - name: Update Pods - command: cd Example && bundle exec pod install - - save_cache: - name: Save Pods cache - paths: - - Pods - key: v1-pods-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Example/Podfile.lock" }} - - run: - name: Build and analyze Example - command: xcodebuild build analyze -workspace Example/ChatExample.xcworkspace -scheme ChatExample -destination "$DESTINATION" ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO | xcpretty -c - - # Collect XML test results data to show in the UI, - # and save the same XML files under test-results folder - # in the Artifacts tab. - #- store_test_results: - # path: test_output/report.xml - #- store_artifacts: - # path: /tmp/test-results - # destination: scan-test-results - #- store_artifacts: - # path: ~/Library/Logs/scan - # destination: scan-logs - -workflows: - build_and_tests: - jobs: - - build_tests diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 8b89d351..00000000 --- a/.travis.yml +++ /dev/null @@ -1,53 +0,0 @@ -language: objective-c -osx_image: xcode8.1 - -env: - global: - - LANG=en_US.UTF-8 - - - PROJECT="MessageKit.xcodeproj" - - IOS_SCHEME="MessageKit" - - IOS_SDK=iphonesimulator10.1 - - matrix: - - - DESTINATION="OS=9.0,name=iPhone 6 Plus" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" RUN_UI_TESTS="YES" - - DESTINATION="OS=9.1,name=iPhone 6s" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO" - - DESTINATION="OS=9.2,name=iPhone 6s" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO" - - DESTINATION="OS=9.3,name=iPad Pro" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO" - - - DESTINATION="OS=10.0,name=iPhone 6s" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" RUN_UI_TESTS="YES" - - DESTINATION="OS=10.1,name=iPhone 7" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" RUN_UI_TESTS="NO" - -script: - -- if [ $POD_LINT == "YES" ]; then - pod lib lint; - fi - - -- if [ $BUILD_EXAMPLE == "YES" ]; then - xcodebuild build analyze -project Example/ChatExample.xcodeproj -scheme ChatExample -sdk "$SDK" -destination "$DESTINATION" ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO | xcpretty -c; - fi - - -- if [ $RUN_TESTS == "YES" ]; then - xcodebuild analyze test -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO | xcpretty -c; - else - xcodebuild build analyze -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO | xcpretty -c; - fi - - -- if [ $RUN_UI_TESTS == "YES" ]; then - xcodebuild test -project Example/ChatExample.xcodeproj -scheme ChatExampleUITests -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO | xcpretty -c; - fi - - -# Build for reporting test coverage -- if [ $RUN_TESTS == "YES" ]; then - xcodebuild test -project MessageKit.xcodeproj -scheme MessageKit -destination "platform=iOS Simulator,name=iPhone 7" CODE_SIGNING_REQUIRED=NO; - fi - - -after_success: -- bash <(curl -s https://codecov.io/bash) From 71d175913b284c9c08572ab348a6889917e907c6 Mon Sep 17 00:00:00 2001 From: Jakub Kaspar Date: Tue, 17 Mar 2020 23:27:47 +0100 Subject: [PATCH 2/2] Update swiftlint --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 71782c63..f8857468 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,7 +24,7 @@ GEM no_proxy_fix octokit (~> 4.7) terminal-table (~> 1) - danger-swiftlint (0.24.1) + danger-swiftlint (0.24.2) danger rake (> 10) thor (~> 0.19) @@ -40,7 +40,7 @@ GEM multipart-post (2.1.1) nap (1.1.0) no_proxy_fix (0.1.2) - octokit (4.16.0) + octokit (4.17.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) open4 (1.3.4) @@ -53,7 +53,7 @@ GEM terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thor (0.20.3) - unicode-display_width (1.6.1) + unicode-display_width (1.7.0) PLATFORMS ruby