TouchInstinct
/
RxSwift
303
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Travis Xcode7 fixes.

This commit is contained in:
Krunoslav Zaher 2015-08-06 09:26:17 +02:00
parent 8957cab8f9
commit 701e7bd4cc
3 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,6 +1,6 @@
language: objective-c
osx_image: xcode7.0
osx_image: xcode7
xcode_sdk: iphonesimulator9.0
notifications:

27
scripts/common.sh
View File

@ -24,22 +24,15 @@ BOLDWHITE="\033[1m\033[37m"
DEFAULT_IOS7_SIMULATOR=RxSwiftTest-iPhone4s-iOS_7.1
DEFAULT_IOS8_SIMULATOR=RxSwiftTest-iPhone6-iOS_8.4
DEFAULT_IOS9_SIMULATOR=RxSwiftTest-iPhone6-iOS_9.0
IOS7_SIMULATORS="RxSwiftTest-iPhone4s-iOS_7.1 RxSwiftTest-iPhone5-iOS_7.1 RxSwiftTest-iPhone5s-iOS_7.1"
IOS8_SIMULATORS="RxSwiftTest-iPhone4s-iOS_8.4 RxSwiftTest-iPhone5-iOS_8.4 RxSwiftTest-iPhone5s-iOS_8.4 RxSwiftTest-iPhone6-iOS_8.4 RxSwiftTest-iPhone6Plus-iOS_8.4"
#IOS9_SIMULATORS="RxSwiftTest-iPhone4s-iOS_9.0 RxSwiftTest-iPhone5-iOS_9.0 RxSwiftTest-iPhone5s-iOS_9.0 RxSwiftTest-iPhone6-iOS_9.0 RxSwiftTest-iPhone6Plus-iOS_9.0"
IOS9_SIMULATORS="cRxSwiftTest-iPhone6-iOS_9.0"
BUILD_DIRECTORY=build
function ios7simulator() {
A=($IOS7_SIMULATORS)
echo ${A[$1]}
}
function ios8simulator() {
A=($IOS8_SIMULATORS)
echo ${A[$1]}
}
function rx() {
SCHEME=$1
CONFIGURATION=$2
@ -88,6 +81,13 @@ function createDevices() {
xcrun simctl create RxSwiftTest-iPhone6-iOS_8.4 'iPhone 6' 'com.apple.CoreSimulator.SimRuntime.iOS-8-4'
xcrun simctl create RxSwiftTest-iPhone6Plus-iOS_8.4 'iPhone 6 Plus' 'com.apple.CoreSimulator.SimRuntime.iOS-8-4'
xcrun simctl create RxSwiftTest-iPhone4s-iOS_9.0 'iPhone 4s' 'com.apple.CoreSimulator.SimRuntime.iOS-9-0'
xcrun simctl create RxSwiftTest-iPhone5-iOS_9.0 'iPhone 5' 'com.apple.CoreSimulator.SimRuntime.iOS-9-0'
xcrun simctl create RxSwiftTest-iPhone5s-iOS_9.0 'iPhone 5s' 'com.apple.CoreSimulator.SimRuntime.iOS-9-0'
xcrun simctl create RxSwiftTest-iPhone6-iOS_9.0 'iPhone 6' 'com.apple.CoreSimulator.SimRuntime.iOS-9-0'
xcrun simctl create RxSwiftTest-iPhone6Plus-iOS_9.0 'iPhone 6 Plus' 'com.apple.CoreSimulator.SimRuntime.iOS-9-0'
}
function deleteDevices() {
@ -101,4 +101,11 @@ function deleteDevices() {
xcrun simctl delete RxSwiftTest-iPhone6-iOS_8.4
xcrun simctl delete RxSwiftTest-iPhone6Plus-iOS_8.4
xcrun simctl delete RxSwiftTest-iPhone4s-iOS_9.0
xcrun simctl delete RxSwiftTest-iPhone5-iOS_9.0
xcrun simctl delete RxSwiftTest-iPhone5s-iOS_9.0
xcrun simctl delete RxSwiftTest-iPhone6-iOS_9.0
xcrun simctl delete RxSwiftTest-iPhone6Plus-iOS_9.0
}

32
scripts/pre-release-tests.sh
View File

@ -6,24 +6,31 @@ if [ "$#" -eq 1 ]; then
IS_LOCAL=1
else
# ios 7 sim
if [ `xcrun simctl list | grep "${DEFAULT_IOS7_SIMULATOR}" | wc -l` == 0 ]; then
xcrun simctl create $DEFAULT_IOS7_SIMULATOR 'iPhone 4s' 'com.apple.CoreSimulator.SimRuntime.iOS-7-1'
else
echo "${DEFAULT_IOS7_SIMULATOR} exists"
fi
#if [ `xcrun simctl list | grep "${DEFAULT_IOS7_SIMULATOR}" | wc -l` == 0 ]; then
# xcrun simctl create $DEFAULT_IOS7_SIMULATOR 'iPhone 4s' 'com.apple.CoreSimulator.SimRuntime.iOS-7-1'
#else
# echo "${DEFAULT_IOS7_SIMULATOR} exists"
#fi
#ios 8 sim
if [ `xcrun simctl list | grep "${DEFAULT_IOS8_SIMULATOR}" | wc -l` == 0 ]; then
xcrun simctl create $DEFAULT_IOS8_SIMULATOR 'iPhone 6' 'com.apple.CoreSimulator.SimRuntime.iOS-8-4'
#if [ `xcrun simctl list | grep "${DEFAULT_IOS8_SIMULATOR}" | wc -l` == 0 ]; then
# xcrun simctl create $DEFAULT_IOS8_SIMULATOR 'iPhone 6' 'com.apple.CoreSimulator.SimRuntime.iOS-8-4'
#else
# echo "${DEFAULT_IOS8_SIMULATOR} exists"
#fi
#ios 9 sim
if [ `xcrun simctl list | grep "${DEFAULT_IOS9_SIMULATOR}" | wc -l` == 0 ]; then
xcrun simctl create $DEFAULT_IOS9_SIMULATOR 'iPhone 6' 'com.apple.CoreSimulator.SimRuntime.iOS-9-0'
else
echo "${DEFAULT_IOS8_SIMULATOR} exists"
echo "${DEFAULT_IOS9_SIMULATOR} exists"
fi
fi
#make sure all iOS tests pass
for configuration in "Debug" "Release-Tests" "Release"
do
rx "RxTests-iOS" ${configuration} $DEFAULT_IOS8_SIMULATOR test
rx "RxTests-iOS" ${configuration} $DEFAULT_IOS9_SIMULATOR test
done
#make sure all OSX tests pass
@ -37,8 +44,9 @@ for scheme in "RxExample-iOS-no-module"
do
for configuration in "Debug" "Release-Tests" "Release"
do
rx ${scheme} ${configuration} $DEFAULT_IOS7_SIMULATOR build
rx ${scheme} ${configuration} $DEFAULT_IOS8_SIMULATOR build
#rx ${scheme} ${configuration} $DEFAULT_IOS7_SIMULATOR build
#rx ${scheme} ${configuration} $DEFAULT_IOS8_SIMULATOR build
rx ${scheme} ${configuration} $DEFAULT_IOS9_SIMULATOR build
done
done
@ -47,7 +55,7 @@ for scheme in "RxExample-iOS"
do
for configuration in "Debug" "Release-Tests" "Release"
do
rx ${scheme} ${configuration} $DEFAULT_IOS8_SIMULATOR build
rx ${scheme} ${configuration} $DEFAULT_IOS9_SIMULATOR build
done
done