Skip to content

Commit ec32226

Browse files
authored
Merge pull request #482 from NativeScript/plamen5kov/fix_travis
updated travis script to call right tasks
2 parents 6c23058 + e9fe007 commit ec32226

2 files changed

Lines changed: 14 additions & 20 deletions

File tree

.travis.yml

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
env:
22
global:
3-
- NDK_VERSION=r10e
3+
- NDK_VERSION=r11c
44
- DATE=$(date +%Y-%m-%d)
55
- PACKAGE_VERSION=$DATE-$TRAVIS_BUILD_NUMBER
6-
- ANDROID_VERSION=19
7-
- ANDROID_SUPPORT_VERSION=19.0.0
86
- PACKAGE_NAME=tns-android
97
sudo: false
108
language: android
@@ -16,11 +14,9 @@ android:
1614
components:
1715
- platform-tools
1816
- tools
19-
- build-tools-22.0.1
20-
- android-19
21-
- extra-android-support
22-
- extra-android-m2repository
23-
- sys-img-armeabi-v7a-android-19
17+
- build-tools-23.0.3
18+
- android-23
19+
- sys-img-armeabi-v7a-android-21
2420
before_cache:
2521
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
2622
cache:
@@ -30,20 +26,19 @@ cache:
3026
before_install:
3127
- sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
3228
- git submodule update --init --recursive
33-
- wget http://dl.google.com/android/ndk/android-ndk-$NDK_VERSION-linux-x86_64.bin
34-
- chmod +x android-ndk-$NDK_VERSION-linux-x86_64.bin
35-
- "./android-ndk-$NDK_VERSION-linux-x86_64.bin | egrep -v ^Extracting"
29+
- wget http://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip
30+
- chmod +x android-ndk-$NDK_VERSION-linux-x86_64.zip
31+
- "unzip -q android-ndk-$NDK_VERSION-linux-x86_64.zip"
32+
- "rm -rf android-ndk-$NDK_VERSION-linux-x86_64.zip"
3633
- export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION
3734
- export PATH=${PATH}:${ANDROID_NDK_HOME}
38-
before_script:
39-
- echo no | android create avd --force -n Arm19 -t android-19 -b armeabi-v7a -c 12M
40-
- emulator -avd Arm19 -no-skin -no-audio -no-window &
41-
- android-wait-for-emulator
4235
script:
43-
- "./gradlew packar -i -PPACKAGE_VERSION=$PACKAGE_VERSION -PcompileSdk=android-$ANDROID_VERSION
44-
-PsupportVersion=$ANDROID_SUPPORT_VERSION --stacktrace"
45-
- "./gradlew runtest -PenableTest -PcompileSdk=android-$ANDROID_VERSION -PsupportVersion=$ANDROID_SUPPORT_VERSION
46-
-PtargetSdk=$ANDROID_VERSION --stacktrace"
36+
- "./gradlew createPackage -i -PPACKAGE_VERSION=$PACKAGE_VERSION --stacktrace"
37+
after_script:
38+
- echo no | android create avd --force -n Arm21 -t android-21 -b armeabi-v7a -c 12M
39+
- emulator -avd Arm21 -no-skin -no-audio -no-window &
40+
- android-wait-for-emulator
41+
- "cd test-app && ./gradlew runtest --stacktrace"
4742
before_deploy:
4843
- FULL_PACKAGE_VERSION=`sed -n 's/\s*"version":\s*"\([a-zA-Z0-9.\-]\+\)"/\1/p' dist/package.json`
4944
- mv dist/$PACKAGE_NAME-$FULL_PACKAGE_VERSION.tgz ../.deploymentpackage

test-app/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ dependencies {
4848
compile project(':binding-generator')
4949
compile fileTree(include: ['*.jar'], dir: 'libs')
5050
testCompile 'junit:junit:4.12'
51-
compile 'com.android.support:appcompat-v7:23.3.0'
5251
}
5352

5453
task deleteDist (type: Delete) {

0 commit comments

Comments
 (0)