From deedae9b71db7b9941c9a5e9f4e5e0bc57fac00a Mon Sep 17 00:00:00 2001 From: Martin Reinhardt Date: Mon, 29 Jan 2018 20:12:46 +0100 Subject: [PATCH 1/8] chore(build): Improved travis build * Added native android build * Added iOS build in Travis * Utilize stages --- .travis.yml | 127 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 86 insertions(+), 41 deletions(-) diff --git a/.travis.yml b/.travis.yml index e29696cf7..715c740e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,48 +1,93 @@ env: global: - - NODE_VERSION=8.9.0 - - EMULATOR_API_LEVEL=19 - - ANDROID_VERSION=25 - - ANDROID_BUILD_TOOLS_VERSION=25.0.2 - - ANDROID_ABI=armeabi-v7a - - APPIUM_VERSION=1.7.0 - - EMULATOR_NAME=test -language: android -jdk: -- oraclejdk8 + - NODE_VERSION=8.9.0 + - EMULATOR_API_LEVEL=22 + - ANDROID_VERSION=25 + - ANDROID_BUILD_TOOLS_VERSION=25.0.2 + - ANDROID_ABI=armeabi-v7a + - APPIUM_VERSION=1.7.0 + - EMULATOR_NAME=test + - ANDROID_TAG=google_apis + +matrix: + include: + - stage: "Lint" + language: node_js + os: linux + node_js: "6" + script: + - cd nativescript-angular + - npm install + - npm run tslint + - stage: "Build" + os: osx + env: + - Build="iOS" + osx_image: xcode8.3 + language: node_js + node_js: "8" + jdk: oraclejdk8 + before_install: + - cd nativescript-angular + - npm install + - npm run ngc + - cd .. + script: + - cd tests + - npm install + - language: android + os: linux + env: + - Build="Android" + jdk: oraclejdk8 + before_install: + - echo no | android create avd --force -n $EMULATOR_NAME -t "android-"$EMULATOR_API_LEVEL --abi $ANDROID_ABI --tag $ANDROID_TAG -c 12M + - QEMU_AUDIO_DRV=none emulator -avd $EMULATOR_NAME -no-window & + - nvm install $NODE_VERSION + - cd nativescript-angular + - npm install + - npm run ngc + - cd .. + - android-wait-for-emulator + - adb shell input keyevent 82 & + script: + - cd tests + - npm install + android: components: - - tools - - platform-tools - - build-tools-$ANDROID_BUILD_TOOLS_VERSION - - android-$ANDROID_VERSION - - android-$EMULATOR_API_LEVEL - - extra-android-support - - extra-android-m2repository - - sys-img-$ANDROID_ABI-android-$EMULATOR_API_LEVEL + - tools + - platform-tools + - build-tools-25.0.2 + - android-25 + - android-$EMULATOR_API_LEVEL + - extra-google-google_play_services + - extra-google-m2repository + - extra-android-m2repository + - addon-google_apis-google-25 + # Specify at least one system image, + # if you need to run emulator(s) during your tests + - sys-img-armeabi-v7a-android-26 + - sys-img-armeabi-v7a-android-25 + - sys-img-armeabi-v7a-android-17 + - sys-img-armeabi-v7a-android-19 + - sys-img-armeabi-v7a-google_apis-$EMULATOR_API_LEVEL + licenses: + - ".+" + before_cache: -- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + cache: - directories: - - "$HOME/.gradle/caches/" - - "$HOME/.gradle/wrapper/" + directories: + - .nvm + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ + install: -- nvm install $NODE_VERSION -- npm install -g typings -- echo y | $ANDROID_HOME/tools/android update sdk --filter tools --all --no-ui -- wget -O ./nativescript.tgz "https://s3.amazonaws.com/nativescript-ci/build_result/nativescript.tgz" -- npm install -g nativescript.tgz --ignore-scripts -- tns usage-reporting disable -- tns error-reporting disable -- cd nativescript-angular -- npm install -- npm run tslint -- cd ../tests -- npm install -before_script: - - echo no | android create avd --force -n $EMULATOR_NAME -t android-$EMULATOR_API_LEVEL --abi $ANDROID_ABI -c 12M - - emulator -avd $EMULATOR_NAME -no-skin -no-audio -no-window & - - android-wait-for-emulator -script: -- tns build android -- android-wait-for-emulator + - nvm install $NODE_VERSION + - npm install -g typings + - wget -O ./nativescript.tgz "https://s3.amazonaws.com/nativescript-ci/build_result/nativescript.tgz" + - npm install -g nativescript.tgz --ignore-scripts + - tns usage-reporting disable + - tns error-reporting disable From 8da525c3a98ccd36efa1dae18d7de31e0d1602e7 Mon Sep 17 00:00:00 2001 From: Martin Reinhardt Date: Fri, 9 Feb 2018 05:26:18 +0100 Subject: [PATCH 2/8] chore(build): Adding missing build entries --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 715c740e1..31d5bea92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ matrix: - npm run ngc - cd .. script: + - tns build ios - cd tests - npm install - language: android @@ -51,6 +52,7 @@ matrix: - android-wait-for-emulator - adb shell input keyevent 82 & script: + - tns build android - cd tests - npm install From c8d028c0f5bf9424c624c5f574db487bb21e5fc1 Mon Sep 17 00:00:00 2001 From: Martin Reinhardt Date: Tue, 13 Feb 2018 12:35:35 +0100 Subject: [PATCH 3/8] chore(build): Fix build --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31d5bea92..9f603e05a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,8 +33,9 @@ matrix: - npm run ngc - cd .. script: + - cd nativescript-angular - tns build ios - - cd tests + - cd ../tests - npm install - language: android os: linux @@ -52,8 +53,9 @@ matrix: - android-wait-for-emulator - adb shell input keyevent 82 & script: + - cd nativescript-angular - tns build android - - cd tests + - cd ../tests - npm install android: From e938a40d4c068556fa8aca9d1d0084d5de482d29 Mon Sep 17 00:00:00 2001 From: Martin Reinhardt Date: Thu, 15 Mar 2018 06:13:26 +0100 Subject: [PATCH 4/8] chore(build): Switching command order --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f603e05a..42b9d4bfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,10 +33,10 @@ matrix: - npm run ngc - cd .. script: - - cd nativescript-angular - - tns build ios - - cd ../tests + - cd tests - npm install + - cd ../nativescript-angular + - tns build ios - language: android os: linux env: @@ -53,10 +53,10 @@ matrix: - android-wait-for-emulator - adb shell input keyevent 82 & script: - - cd nativescript-angular - - tns build android - - cd ../tests + - cd tests - npm install + - cd ../nativescript-angular + - tns build android android: components: From 3b2014beb453f20a722d59b76064a7585eb8566c Mon Sep 17 00:00:00 2001 From: "Reinhardt, Martin" Date: Thu, 22 Mar 2018 05:34:12 +0100 Subject: [PATCH 5/8] chore(build): Let test project build --- .travis.yml | 12 +++++++----- tests/package.json | 10 ++++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42b9d4bfa..047c9240f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,9 +33,10 @@ matrix: - npm run ngc - cd .. script: - - cd tests + - cd nativescript-angular + - tns build ios + - cd ../tests - npm install - - cd ../nativescript-angular - tns build ios - language: android os: linux @@ -53,9 +54,10 @@ matrix: - android-wait-for-emulator - adb shell input keyevent 82 & script: - - cd tests + - cd nativescript-angular + - tns build android + - cd ../tests - npm install - - cd ../nativescript-angular - tns build android android: @@ -94,4 +96,4 @@ install: - wget -O ./nativescript.tgz "https://s3.amazonaws.com/nativescript-ci/build_result/nativescript.tgz" - npm install -g nativescript.tgz --ignore-scripts - tns usage-reporting disable - - tns error-reporting disable + - tns error-reporting disable \ No newline at end of file diff --git a/tests/package.json b/tests/package.json index b7cc8a1ee..8d8d403c1 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,6 +1,12 @@ { "nativescript": { - "id": "org.nativescript.ngtests" + "id": "org.nativescript.ngtests", + "tns-ios": { + "version": "3.4.1" + }, + "tns-android": { + "version": "3.4.2" + } }, "name": "ngtests", "main": "app.js", @@ -68,4 +74,4 @@ "compile-tests-w": "tsc -p e2e --watch", "update-app-ng-deps": "update-app-ng-deps" } -} \ No newline at end of file +} From 445491076d07c27456c919cc3083e8f5a58e732f Mon Sep 17 00:00:00 2001 From: "Reinhardt, Martin" Date: Thu, 22 Mar 2018 07:26:31 +0100 Subject: [PATCH 6/8] chore(build): Fix Travis build * test on nodejs 6 and 8 * build angular and test project --- .travis.yml | 55 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 047c9240f..a66b35dbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ env: global: - - NODE_VERSION=8.9.0 + - NODE_VERSION=6 + - NODE_VERSION=8 - EMULATOR_API_LEVEL=22 - ANDROID_VERSION=25 - ANDROID_BUILD_TOOLS_VERSION=25.0.2 @@ -14,7 +15,8 @@ matrix: - stage: "Lint" language: node_js os: linux - node_js: "6" + before_install: + - nvm install $NODE_VERSION script: - cd nativescript-angular - npm install @@ -25,20 +27,39 @@ matrix: - Build="iOS" osx_image: xcode8.3 language: node_js - node_js: "8" + node_js: "6" jdk: oraclejdk8 before_install: - cd nativescript-angular - npm install - - npm run ngc + - cd ../tests + - npm install - cd .. script: - cd nativescript-angular + - npm run ngc + - cd ../tests - tns build ios + - os: osx + env: + - Build="iOS" + osx_image: xcode8.3 + language: node_js + node_js: "8" + jdk: oraclejdk8 + before_install: + - cd nativescript-angular + - npm install - cd ../tests - npm install + - cd .. + script: + - cd nativescript-angular + - npm run ngc + - cd ../tests - tns build ios - language: android + node_js: "6" os: linux env: - Build="Android" @@ -49,15 +70,37 @@ matrix: - nvm install $NODE_VERSION - cd nativescript-angular - npm install - - npm run ngc + - cd ../tests + - npm install - cd .. - android-wait-for-emulator - adb shell input keyevent 82 & script: - cd nativescript-angular + - npm run ngc + - cd ../tests - tns build android + - language: android + node_js: "8" + os: linux + env: + - Build="Android" + jdk: oraclejdk8 + before_install: + - echo no | android create avd --force -n $EMULATOR_NAME -t "android-"$EMULATOR_API_LEVEL --abi $ANDROID_ABI --tag $ANDROID_TAG -c 12M + - QEMU_AUDIO_DRV=none emulator -avd $EMULATOR_NAME -no-window & + - nvm install $NODE_VERSION + - cd nativescript-angular + - npm install - cd ../tests - npm install + - cd .. + - android-wait-for-emulator + - adb shell input keyevent 82 & + script: + - cd nativescript-angular + - npm run ngc + - cd ../tests - tns build android android: @@ -96,4 +139,4 @@ install: - wget -O ./nativescript.tgz "https://s3.amazonaws.com/nativescript-ci/build_result/nativescript.tgz" - npm install -g nativescript.tgz --ignore-scripts - tns usage-reporting disable - - tns error-reporting disable \ No newline at end of file + - tns error-reporting disable From ec0d1e324df9cec5794059deb96edd900800f9a5 Mon Sep 17 00:00:00 2001 From: Martin Reinhardt Date: Thu, 22 Mar 2018 11:41:11 +0100 Subject: [PATCH 7/8] chore(package): Use next version of runtimes during tests --- tests/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/package.json b/tests/package.json index 8d8d403c1..e3b3cf922 100644 --- a/tests/package.json +++ b/tests/package.json @@ -2,10 +2,10 @@ "nativescript": { "id": "org.nativescript.ngtests", "tns-ios": { - "version": "3.4.1" + "version": "next" }, "tns-android": { - "version": "3.4.2" + "version": "next" } }, "name": "ngtests", From 0bba03d30c4f1c988a4b8e64538d22d42930013b Mon Sep 17 00:00:00 2001 From: Martin Reinhardt Date: Thu, 22 Mar 2018 12:47:03 +0100 Subject: [PATCH 8/8] chore(build): Adding newer build tools for Android --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a66b35dbe..6cfafd7c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ env: - NODE_VERSION=8 - EMULATOR_API_LEVEL=22 - ANDROID_VERSION=25 - - ANDROID_BUILD_TOOLS_VERSION=25.0.2 + - ANDROID_BUILD_TOOLS_VERSION=26.0.2 - ANDROID_ABI=armeabi-v7a - APPIUM_VERSION=1.7.0 - EMULATOR_NAME=test @@ -108,6 +108,7 @@ android: - tools - platform-tools - build-tools-25.0.2 + - build-tools-$ANDROID_BUILD_TOOLS_VERSION - android-25 - android-$EMULATOR_API_LEVEL - extra-google-google_play_services