Skip to content

Commit 98810ca

Browse files
committed
Travis updates; Cartfile PMK specification bump
1 parent a7a236c commit 98810ca

File tree

2 files changed

+26
-19
lines changed

2 files changed

+26
-19
lines changed

.travis.yml

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1+
os: osx
2+
language: swift
3+
osx_image: xcode10.2
4+
15
branches:
26
only:
37
- master
48
stages:
59
- lint
610
- carthage
711
- test
8-
os: osx
9-
language: swift
1012
jobs:
1113
include:
1214
- &pod
13-
env: SWIFT=3.1
14-
name: pod lib lint --swift-version=3.1
1515
stage: lint
1616
osx_image: xcode8.3
17+
env: SWIFT=3.1
1718
before_install:
18-
gem install cocoapods --prerelease --version 1.7.0.beta.2
19+
gem install cocoapods --prerelease --version 1.7.0.beta.3
1920
install:
2021
carthage bootstrap --no-build PromiseKit
2122
script: |
@@ -27,45 +28,51 @@ jobs:
2728
- <<: *pod
2829
osx_image: xcode9.2
2930
env: SWIFT=3.2
30-
name: pod lib lint --swift-version=3.2
3131
- <<: *pod
3232
osx_image: xcode9.4
3333
env: SWIFT=3.3
34-
name: pod lib lint --swift-version=3.3
3534
- <<: *pod
3635
osx_image: xcode10.1
3736
env: SWIFT=3.4
38-
name: pod lib lint --swift-version=3.4
3937
- <<: *pod
4038
osx_image: xcode9.2
4139
env: SWIFT=4.0
42-
name: pod lib lint --swift-version=4.0
4340
- <<: *pod
4441
osx_image: xcode9.4
4542
env: SWIFT=4.1
46-
name: pod lib lint --swift-version=4.1
4743
- <<: *pod
4844
osx_image: xcode10.1
4945
env: SWIFT=4.2
50-
name: pod lib lint --swift-version=4.2
5146
- <<: *pod
5247
osx_image: xcode10.2
5348
env: SWIFT=5.0
54-
name: pod lib lint --swift-version=5.0
49+
50+
- &carthage
51+
stage: carthage
52+
osx_image: xcode9.2
53+
script: |
54+
carthage bootstrap --cache-builds
55+
sed -i '' "s/SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;/SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;/" *.xcodeproj/project.pbxproj
56+
carthage build --no-skip-current
57+
cache:
58+
directories:
59+
- Carthage
60+
- <<: *carthage
61+
osx_image: xcode9.4
62+
- <<: *carthage
63+
osx_image: xcode10.1
64+
- <<: *carthage
65+
osx_image: xcode10.2
5566

5667
- &test
57-
name: iOS Tests
5868
stage: test
59-
osx_image: xcode10.2
6069
xcode_scheme: PMKUIKit
6170
xcode_project: PMKUIKit.xcodeproj
62-
before_install: carthage bootstrap --cache-builds --no-use-binaries
6371
xcode_destination: 'platform=iOS Simulator,OS=12.2,name=iPhone SE'
6472
cache:
6573
directories:
6674
- Carthage
67-
before_script:
68-
sed -i '' 's/SWIFT_TREAT_WARNINGS_AS_ERRORS = NO/SWIFT_TREAT_WARNINGS_AS_ERRORS = YES/g' PMKUIKit.xcodeproj/project.pbxproj
75+
before_install:
76+
carthage bootstrap --cache-builds --no-use-binaries
6977
- <<: *test
70-
name: tvOS Tests
7178
xcode_destination: 'platform=tvOS Simulator,OS=12.2,name=Apple TV'

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "mxcl/PromiseKit" ~> 6.0
1+
github "mxcl/PromiseKit" ~> 6.8.4

0 commit comments

Comments
 (0)