Skip to content

Commit

Permalink
Merge pull request Moya#1606 from Moya/master
Browse files Browse the repository at this point in the history
Sync development branch with master
  • Loading branch information
SD10 authored Mar 14, 2018
2 parents 6af0de8 + 5bdb72b commit 8744753
Show file tree
Hide file tree
Showing 22 changed files with 614 additions and 277 deletions.
77 changes: 77 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
version: 2
jobs:
build:
working_directory: ~/Moya/Moya
parallelism: 1
shell: /bin/bash --login
environment:
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
LANG: en_US.UTF-8
BUNDLE_PATH: vendor/bundle
macos:
xcode: '9.2.0'
steps:
- checkout
- run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
- restore_cache:
keys:
- v1-dep-{{ .Branch }}-
- v1-dep-master-
- v1-dep-
- run:
name: Set Ruby Version
command: echo "ruby-2.4" > ~/.ruby-version
- run:
name: Fetch CocoaPods Specs
command: curl -sS https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash
- run:
name: Update Homebrew
command: brew update
- run:
name: Install Swiftlint
command: brew install swiftlint
- run:
name: Install Ruby Dependencies
command: bundle check || bundle install
environment:
BUNDLE_JOBS: 4
BUNDLE_RETRY: 3
- run:
name: Bootstrap Carthage
command: scripts/bootstrap-if-needed.sh
- save_cache:
key: v1-dep-{{ .Branch }}-{{ epoch }}
paths:
- vendor/bundle
- Carthage
- run:
name: Test on iOS
command: rake test:ios
- run:
name: Test on macOS
command: rake test:macos
- run:
name: Test on tvOS
command: rake test:tvos
- run:
name: Test with Carthage
command: rake test:carthage
- run:
name: Build Example Project
command: rake build_example
- run:
name: Run Danger
command: bundle exec danger
- run:
name: Send Code Coverage to Codecov.io
command: bash <(curl -s https://codecov.io/bash) -J Moya
- run:
name: Store Xcode Activity Log
command: find $HOME/Library/Developer/Xcode/DerivedData -name '*.xcactivitylog' -exec cp {} $CIRCLE_ARTIFACTS/xcactivitylog \; || true
- store_test_results:
path: /tmp/circleci-test-results
- store_artifacts:
path: /tmp/circleci-artifacts
- store_artifacts:
path: /tmp/circleci-test-results
1 change: 1 addition & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ exemptLabels:
- "enhancement"
- "confirmed bug"
- "chore"
- "discussion"

# Label to use when marking as stale
staleLabel: stale
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ github "AliSoftware/OHHTTPStubs" "f90c2bb0fb882e43761ab963ca8869d349d2c6e3"
github "Quick/Nimble" "v7.0.3"
github "Quick/Quick" "v1.2.0"
github "ReactiveCocoa/ReactiveSwift" "3.1.0"
github "ReactiveX/RxSwift" "4.1.1"
github "ReactiveX/RxSwift" "4.1.2"
github "antitypical/Result" "3.2.4"
Loading

0 comments on commit 8744753

Please sign in to comment.