Skip to content

Commit 1daa0c9

Browse files
committed
[Fix] Build server issues.
1 parent f441ecf commit 1daa0c9

File tree

4 files changed

+15
-18
lines changed

4 files changed

+15
-18
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: objective-c
22

3-
osx_image: xcode7.3
3+
osx_image: xcode8
44

55
notifications:
66
slack: rxswift:3ykt2Z61f8GkdvhCZTYPduOL

scripts/all-tests.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ function checkPlistVersions() {
4646

4747
checkPlistVersions
4848

49-
if [ "${IS_SWIFT_3}" -ne 1 ]; then
50-
./scripts/validate-headers.swift
51-
./scripts/package-spm.swift > /dev/null
52-
fi
5349
ensureNoGitChanges "Package for Swift package manager isn't updated, please run ./scripts/package-spm.swift and commit the changes"
5450

5551
CONFIGURATIONS=(Release-Tests)
@@ -126,9 +122,3 @@ do
126122
rx ${scheme} ${configuration} "" build
127123
done
128124
done
129-
130-
# compile and run playgrounds
131-
132-
if [ "${IS_SWIFT_3}" -ne 1 ]; then
133-
. scripts/validate-playgrounds.sh
134-
fi

scripts/common.sh

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,22 @@ BOLDWHITE="\033[1m\033[37m"
2121

2222
# make sure all tests are passing
2323

24-
IS_SWIFT_3=`swift --version | grep "Apple Swift version 3.0" | wc -l`
25-
26-
if [ "${IS_SWIFT_3}" -eq 1 ]; then
24+
if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.iOS-10-1 | wc -l` -eq 1 ]; then
2725
DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/10.1
26+
else
27+
DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/10.0
28+
fi
29+
30+
if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.watchOS-3-1 | wc -l` -eq 1 ]; then
2831
DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/3.1
29-
DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/10.0
3032
else
31-
DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/9.3
32-
DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/2.2
33-
DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/9.1
33+
DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/3.0
34+
fi
35+
36+
if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.tvOS-10-1 | wc -l` -eq 1 ]; then
37+
DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/10.1
38+
else
39+
DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/10.0
3440
fi
3541

3642
function runtime_available() {

scripts/validate-headers.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ let excludedRootPaths = [
4040

4141
let excludePaths = [
4242
"AllTests/main.swift",
43+
"AllTestz/main.swift",
4344
"RxExample/Services/Reachability.swift",
4445
"RxCocoaTests/RxTests-"
4546
]

0 commit comments

Comments
 (0)