Skip to content

Commit 28fd77b

Browse files
SvetoslavTsenovsis0k0
authored andcommitted
Update travis (#808)
1 parent bb3b0bb commit 28fd77b

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

Diff for: .travis.yml

+16-9
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,23 @@ env:
33
- NODE_VERSION=6.9.1
44
- DATE=$(date +%Y-%m-%d)
55
- PACKAGE_VERSION=$DATE-$TRAVIS_BUILD_NUMBER
6+
- EMULATOR_API_LEVEL=19
7+
- ANDROID_VERSION=23
8+
- ANDROID_BUILD_TOOLS_VERSION=23.0.1
9+
- ANDROID_ABI=armeabi-v7a
10+
- ANDROID_TAG=google_apis
11+
- APPIUM_VERSION=1.6.3
612
language: android
713
jdk:
814
- oraclejdk8
915
android:
1016
components:
1117
- platform-tools
12-
- build-tools-23.0.2
13-
- android-23
18+
- tools
19+
- build-tools-$ANDROID_BUILD_TOOLS_VERSION
20+
- android-$ANDROID_VERSION
1421
- extra-android-m2repository
15-
- sys-img-armeabi-v7a-android-23
22+
- sys-img-armeabi-v7a-android-$EMULATOR_API_LEVEL
1623
before_cache:
1724
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
1825
cache:
@@ -31,16 +38,16 @@ install:
3138
- npm run tslint
3239
- cd ../tests
3340
- npm install
34-
- tns platform add android
3541
before_script:
36-
- echo no | android create avd --force -n test -t android-23 -abi armeabi-v7a
37-
- emulator -memory 1024 -avd test -no-audio -no-window &
42+
- echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi $ANDROID_ABI
43+
- emulator -memory 1024 -avd test -no-audio -no-window &
44+
- android-wait-for-emulator
3845
script:
39-
-
40-
-
46+
-
47+
-
4148
- tns build android
4249
- android-wait-for-emulator
43-
- npm run appium --runtype=android23
50+
- npm run run-appium-android
4451
before_deploy:
4552
- cd ../nativescript-angular
4653
- npm install -g nativescript --ignore-scripts

Diff for: tests/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"nativescript": {
33
"id": "org.nativescript.ngtests",
44
"tns-android": {
5-
"version": "2.5.0"
5+
"version": "3.0.0"
66
},
77
"tns-ios": {
8-
"version": "2.5.0"
8+
"version": "3.0.0"
99
}
1010
},
1111
"name": "ngtests",
@@ -38,7 +38,7 @@
3838
"nativescript-angular": "../nativescript-angular",
3939
"nativescript-unit-test-runner": "^0.3.4",
4040
"rxjs": "^5.2.0",
41-
"tns-core-modules": "next",
41+
"tns-core-modules": "^3.0.0",
4242
"zone.js": "^0.8.2"
4343
},
4444
"devDependencies": {
@@ -56,7 +56,7 @@
5656
"karma-nativescript-launcher": "^0.4.0",
5757
"lazy": "1.0.11",
5858
"mocha": "^2.4.5",
59-
"nativescript-dev-appium": "^0.3.0",
59+
"nativescript-dev-appium": "0.0.14",
6060
"nativescript-dev-typescript": "^0.4.0",
6161
"socket.io": "1.4.8",
6262
"socket.io-client": "1.4.8",

0 commit comments

Comments
 (0)