Skip to content

Commit d4152d3

Browse files
authored
Merge pull request #124 from RxSwiftCommunity/circle
Migrates to CircleCI
2 parents cdc044c + 8dce5b4 commit d4152d3

File tree

8 files changed

+27
-17
lines changed

8 files changed

+27
-17
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ Pods/
2929
#
3030
# Add this line if you want to avoid checking in source code from Carthage dependencies.
3131
#
32-
Carthage/Checkouts
33-
Carthage/Build
32+
Carthage
3433
.DS_Store
3534

3635
# SPM

Carthage/Checkouts/Nimble

Submodule Nimble deleted from 38c9ab0

Carthage/Checkouts/Quick

Submodule Quick deleted from 0ff81f2

Carthage/Checkouts/RxSwift

Submodule RxSwift deleted from 12cccb1

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://travis-ci.org/RxSwiftCommunity/Action.svg)](https://travis-ci.org/RxSwiftCommunity/Action)
1+
[![CircleCI](https://circleci.com/gh/RxSwiftCommunity/Action.svg?style=svg)](https://circleci.com/gh/RxSwiftCommunity/Action)
22

33
Action
44
======

bin/bootstrap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
3+
carthage bootstrap
4+
cp Cartfile.resolved Carthage

bin/bootstrap-if-needed

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
3+
# Borrowed from https://robots.thoughtbot.com/caching-carthage-con-circleci
4+
5+
if ! cmp -s Cartfile.resolved Carthage/Cartfile.resolved; then
6+
bin/bootstrap
7+
fi
8+

.travis.yml renamed to circle.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
os: osx
2-
language: objective-c
3-
osx_image: xcode9
4-
5-
before_script:
6-
- carthage version
7-
- carthage bootstrap
8-
9-
script:
1+
machine:
2+
xcode:
3+
version: 9.0
4+
environment:
5+
LANG: en_US.UTF-8
6+
dependencies:
7+
override:
8+
- bin/bootstrap-if-needed
9+
cache_directories:
10+
- "Carthage"
11+
test:
12+
override:
1013
- set -o pipefail
11-
- xcodebuild test -workspace Action.xcworkspace -scheme Action -sdk iphonesimulator -destination "name=iPhone X" | xcpretty -c
14+
- xcodebuild test -workspace Action.xcworkspace -scheme Action -sdk iphonesimulator -destination "name=iPhone X" | xcpretty -c --test
1215
- xcodebuild build -workspace Action.xcworkspace -scheme Action-watchOS -sdk watchsimulator -destination "name=Apple Watch - 38mm" | xcpretty -c
1316
- xcodebuild build -workspace Action.xcworkspace -scheme Action-macOS -sdk macosx -destination "arch=x86_64" | xcpretty -c
1417
- xcodebuild build -workspace Action.xcworkspace -scheme Action-tvOS -sdk appletvsimulator -destination "name=Apple TV 1080p" | xcpretty -c
15-

0 commit comments

Comments
 (0)