Skip to content

Commit d6f37a4

Browse files
committed
Travis deprecated Xcode 8.1/8.2; Bump to 9.2
1 parent b61441b commit d6f37a4

File tree

2 files changed

+23
-51
lines changed

2 files changed

+23
-51
lines changed

.travis.yml

Lines changed: 22 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,27 @@ os: osx
22
language: objective-c
33
matrix:
44
include:
5-
- osx_image: xcode8.2
6-
env: PLAT=macOS SWFT=3.0
7-
- osx_image: xcode8.2
8-
env: PLAT=iOS SWFT=3.0
9-
- osx_image: xcode8.2
10-
env: PLAT=tvOS SWFT=3.0
11-
- osx_image: xcode8.3
12-
env: PLAT=macOS SWFT=3.1
13-
- osx_image: xcode8.3
14-
env: PLAT=iOS SWFT=3.1
15-
- osx_image: xcode8.3
16-
env: PLAT=tvOS SWFT=3.1
17-
- osx_image: xcode9
18-
env: PLAT=macOS SWFT=3.2
19-
- osx_image: xcode9
20-
env: PLAT=iOS SWFT=3.2
21-
- osx_image: xcode9
22-
env: PLAT=tvOS SWFT=3.2
23-
- osx_image: xcode9
24-
env: PLAT=macOS SWFT=4.0
25-
- osx_image: xcode9
26-
env: PLAT=iOS SWFT=4.0
27-
- osx_image: xcode9
28-
env: PLAT=tvOS SWFT=4.0
29-
before_install:
30-
- case $PLAT in
31-
iOS)
32-
NAME="iPhone SE";;
33-
tvOS)
34-
NAME="Apple TV 1080p";;
35-
esac;
36-
if [ -n "$NAME" ]; then
37-
export UUID=$(instruments -s | ruby -e "ARGF.each_line{ |ln| ln =~ /$NAME .* \[(.*)\]/; if \$1; puts(\$1); exit; end }");
38-
export DESTINATION="id=$UUID";
39-
fi
5+
- {osx_image: xcode8.3, env: 'PLAT=macOS SWFT=3.1 DST="arch=x86_64"'}
6+
- {osx_image: xcode8.3, env: 'PLAT=iOS SWFT=3.1 DST="OS=10.3.1,name=iPhone SE"'}
7+
- {osx_image: xcode8.3, env: 'PLAT=tvOS SWFT=3.1 DST="OS=10.2,name=Apple TV 1080p"'}
8+
9+
- {osx_image: xcode9.2, env: 'PLAT=macOS SWFT=3.2 DST="arch=x86_64"'}
10+
- {osx_image: xcode9.2, env: 'PLAT=iOS SWFT=3.2 DST="OS=11.2,name=iPhone SE"'}
11+
- {osx_image: xcode9.2, env: 'PLAT=tvOS SWFT=3.2 DST="OS=11.2,name=Apple TV"'}
12+
13+
- {osx_image: xcode9.2, env: 'PLAT=macOS SWFT=4.0 DST="arch=x86_64"'}
14+
- {osx_image: xcode9.2, env: 'PLAT=iOS SWFT=4.0 DST="OS=8.4,name=iPhone 4s"'}
15+
- {osx_image: xcode9.2, env: 'PLAT=iOS SWFT=4.0 DST="OS=9.3,name=iPhone SE"'}
16+
- {osx_image: xcode9.2, env: 'PLAT=iOS SWFT=4.0 DST="OS=10.3.1,name=iPhone SE"'}
17+
- {osx_image: xcode9.2, env: 'PLAT=iOS SWFT=4.0 DST="OS=11.2,name=iPhone SE"'}
18+
- {osx_image: xcode9.2, env: 'PLAT=tvOS SWFT=4.0 DST="OS=10.2,name=Apple TV 1080p"'}
19+
- {osx_image: xcode9.2, env: 'PLAT=tvOS SWFT=4.0 DST="OS=11.2,name=Apple TV"'}
20+
cache:
21+
directories:
22+
- Carthage
4023
install:
41-
- case $PLAT in
42-
macOS)
43-
carthage bootstrap --platform Mac;;
44-
tvOS|iOS)
45-
carthage bootstrap --platform $PLAT;;
46-
esac;
24+
- carthage bootstrap --cache-builds --no-use-binaries --platform $PLAT
4725
script:
48-
- set -o pipefail;
49-
case $PLAT in
50-
macOS)
51-
xcodebuild -scheme PMKMapKit -quiet build clean SWIFT_VERSION=$SWFT;
52-
xcodebuild -scheme PMKMapKit -quiet test;;
53-
iOS|tvOS)
54-
open -b com.apple.iphonesimulator --args -CurrentDeviceUDID "$UUID";
55-
xcodebuild -scheme PMKMapKit -quiet -destination "$DESTINATION" build clean SWIFT_VERSION=$SWFT;
56-
xcodebuild -scheme PMKMapKit -quiet -destination "$DESTINATION" test;;
57-
esac
26+
- set -o pipefail
27+
- xcodebuild -scheme PMKMapKit -quiet -destination "$DST" build SWIFT_VERSION=$SWFT
28+
- xcodebuild -scheme PMKMapKit -quiet -destination "$DST" test;

Cartfile.resolved

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "mxcl/PromiseKit" "5.0.3"

0 commit comments

Comments
 (0)